Commit Graph

31374 Commits

Author SHA1 Message Date
Saqib Ansari
48449e6d0a feat: decrypt json data with SEK 2020-12-30 11:56:06 +05:30
Saqib Ansari
31596228ff feat: AES decryption of SEK with appkey 2020-12-30 11:56:06 +05:30
Saqib Ansari
017543d59d chore: handle error response 2020-12-30 11:56:06 +05:30
Saqib Ansari
cca0eaaa29 feat: save token and sek from auth request 2020-12-30 11:56:06 +05:30
Saqib Ansari
b52a9283bb feat: rsa encryption with public key 2020-12-30 11:56:06 +05:30
Saqib Ansari
39dabe7381 feat: read public key file 2020-12-30 11:56:06 +05:30
Saqib Ansari
1c213a3dbb feat: init e-invoice settings 2020-12-30 11:56:06 +05:30
Saurabh
95c3258ee4 Merge branch 'v12-pre-release' into version-12 v12.15.0 2020-12-21 16:14:01 +05:30
Saurabh
00e095278d bumped to version 12.15.0 2020-12-21 16:25:38 +05:50
Nabin Hait
53d98ff635 chore: Added change log 2020-12-21 14:31:56 +05:30
Deepesh Garg
8b43faa203 Merge pull request #24175 from deepeshgarg007/tax_category_typo_v12_pre
fix: Validation for duplicate Tax Category
2020-12-17 19:09:13 +05:30
Nabin Hait
5ee6417228 fix: Translation issue 2020-12-17 19:07:37 +05:30
Deepesh Garg
71349d5a49 fix: Validation for duplicate Tax Category 2020-12-17 19:06:31 +05:30
Deepesh Garg
98d8718979 Merge pull request #24162 from deepeshgarg007/template_update_v12_pre
fix(India): Taxation fixes
2020-12-17 09:11:38 +05:30
Deepesh Garg
2a92d1b94a fix: Tax template update on customer address change 2020-12-16 22:03:41 +05:30
pateljannat
af60e85400 fix: removing return_taxes condition 2020-12-16 22:03:31 +05:30
pateljannat
45d8204e1e fix: company filter added again 2020-12-16 22:03:15 +05:30
pateljannat
56d5b68046 fix: linter issue for translation syntax 2020-12-16 22:02:52 +05:30
pateljannat
dafbb80ec5 fix: reversing previous commits and adding condition in regional controller 2020-12-16 22:02:00 +05:30
pateljannat
f226927b6a fix: place of supply change on address change 2020-12-16 22:01:35 +05:30
pateljannat
8cfde675ac fix: place of supply change when address changes 2020-12-16 22:01:27 +05:30
Deepesh Garg
599d7a686e fix: Tax template update on supplier 2020-12-16 22:01:15 +05:30
Nabin Hait
2bd620fac8 fix: Fixed merge conflict 2020-12-11 22:34:34 +05:30
Marica
fe56b800a6 Merge pull request #24081 from pateljannat/sales-invoice-from-sales-order-v12
fix: sales invoice add button on sales order dashboard
2020-12-10 20:09:20 +05:30
Marica
ccdfbd4f40 Merge pull request #24103 from marination/hotfix-debit-credit-opening-invoice-tool
fix: Handle Account and Item None not found in Opening Invoice Creation Tool
2020-12-10 20:06:13 +05:30
Marica
f7f809aae8 Merge branch 'version-12-hotfix' into hotfix-debit-credit-opening-invoice-tool 2020-12-10 20:04:54 +05:30
Mohammad Hasnain Mohsin Rajan
3f399ee806 fix(acc recv report): columns mismatch (#24085) 2020-12-10 19:15:53 +05:30
Marica
7bbe383232 Merge branch 'version-12-hotfix' into hotfix-debit-credit-opening-invoice-tool 2020-12-10 18:58:31 +05:30
marination
1fcd1e4dc0 fix: add assertRaises for error 2020-12-10 17:34:30 +05:30
Anurag Mishra
800a9ae7c3 Merge pull request #24097 from prssanna/chart-imports
fix: function imports in account_balance_timeline.py
2020-12-10 16:32:59 +05:30
marination
a63b5c1a9e fix: Make new Customers for account missing test and set company 2020-12-10 16:31:23 +05:30
marination
74bcb2977f chore: Add Test for missing debit account 2020-12-10 16:30:39 +05:30
marination
96946fa4a0 fix: Handle missing Account and Item in Opening Invoice Creation Tool 2020-12-10 16:30:13 +05:30
Deepesh Garg
e2fb0c567d Merge pull request #24036 from nextchamp-saqib/abs-value-in-pf-v12
fix: get formatted value in 'taxes' print template
2020-12-10 15:35:15 +05:30
Mohammad Hasnain Mohsin Rajan
5a1d912e6d Merge branch 'version-12-hotfix' into sales-invoice-from-sales-order-v12 2020-12-10 14:07:07 +05:30
Prssanna Desai
e152f9a89a Merge pull request #24099 from prssanna/shopping-cart-fix
fix: get value of allow_items_in_stock even if not an exact match
2020-12-10 12:44:48 +05:30
prssanna
6a718a3fc6 fix: get value of allow_items_in_stock even if not an exact match 2020-12-10 12:39:53 +05:30
Saqib
5062b78718 fix: asset with value zero doesn't show up in fixed asset register (#24098) 2020-12-10 12:33:43 +05:30
prssanna
eed12444e1 fix: function imports in account_balance_timeline.py 2020-12-10 12:20:18 +05:30
rohitwaghchaure
326fccfa00 Merge pull request #24001 from rohitwaghchaure/fixed-stock-entry-multi-consumption
fix: incorrect stock quantity if 'Allow Multiple Material Consumption…
2020-12-10 02:11:20 +05:30
Rohit Waghchaure
e7476914cd fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled 2020-12-10 01:27:54 +05:30
rohitwaghchaure
b1507fdaae Merge pull request #24009 from rohitwaghchaure/shipping-charges-not-added-in-invoice
fix: shipping charges not sync from shopify
2020-12-10 01:06:18 +05:30
Prssanna Desai
ede082657f Merge pull request #24093 from prssanna/item-configurator-fix-version-12
fix: allow add to cart for any item if allow_items_not_in_stock is enabled
2020-12-09 17:54:46 +05:30
prssanna
d0303b3fb1 fix: allow add to cart for any item if allow_items_not_in_stock is enabled 2020-12-09 17:32:16 +05:30
Shivam Mishra
91a3ab8e32 Merge pull request #24084 from prssanna/item-configurator-fix
fix(Shopping Cart): allow add to cart for any item if allow_items_not_in_stock is enabled
2020-12-09 16:45:22 +05:30
prssanna
cfb6e3aa30 fix: allow add to cart for any item if allow_items_not_in_stock is enabled 2020-12-08 16:44:38 +05:30
pateljannat
4fe48a30c4 fix: sales invoice add button on sales order dashboard 2020-12-08 12:04:56 +05:30
Jannat Patel
af29bde0e8 Merge pull request #2 from frappe/version-12-hotfix
Version 12 hotfix
2020-12-08 11:39:32 +05:30
Afshan
b83e131b1f fix: throw an error when no pos profile exist (#24026)
* fix: throw an error when no pos profile exist

* fix: tests

* fix: tests

* fix:test
2020-12-08 09:45:14 +05:30
Rucha Mahabal
51015178da fix(POS): do not fetch items until POS Profile is set (#24076) 2020-12-08 09:34:22 +05:30