Commit Graph

30857 Commits

Author SHA1 Message Date
Marica
e1047af4bf Merge branch 'version-12-hotfix' into item-attribute 2020-10-12 17:22:01 +05:30
Saqib
79d069cbbb fix: last purchase rate in item prices report (#23507)
* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* chore: fetch last purchase rate from update stock purchase invoices
2020-10-12 17:09:29 +05:30
rohitwaghchaure
29c2f399e3 Merge pull request #22328 from pipech/v12-hotfix-get_pricing_rule
fix(pricing_rules): pricing rule selector is wrong
2020-10-12 15:33:13 +05:30
rohitwaghchaure
4fa06ad6a6 Merge pull request #23594 from anupamvs/item-price-v12
fix: can't save item price after adding child table
2020-10-12 15:17:34 +05:30
Rushabh Mehta
122fea8043 Merge pull request #23551 from anupamvs/procurement-tracke-v12
fix: project value is missing from procurement-tracker
2020-10-12 15:13:46 +05:30
rohitwaghchaure
660a811483 Merge pull request #23564 from rohitwaghchaure/fixed-batch-wise-stock-reco
fix: negative stock error while submitting stock reco for batch item
2020-10-12 15:11:41 +05:30
rohitwaghchaure
c351e2a03c Merge pull request #23522 from rohitwaghchaure/extra-filters-in-batchwise-balance-report
feat: added new filters in the Batch-wise balance history report
2020-10-12 15:11:21 +05:30
rohitwaghchaure
0cbe0c0b21 Merge pull request #23520 from rohitwaghchaure/feat-added-balance-serial-no-column
feat: balance serial nos in stock leder report
2020-10-12 15:09:42 +05:30
rohitwaghchaure
3ed333831d Merge pull request #23599 from deepeshgarg007/pos_return_amount
fix: Mode of payment getting overwritten by defautl mode of payment for retruns
2020-10-12 15:09:16 +05:30
rohitwaghchaure
a0ed196005 Merge pull request #23600 from rohitwaghchaure/fixed-overproduction-issue
fix: not able to do overproduction
2020-10-12 14:59:41 +05:30
Saqib
f41fe79528 fix(asset): cannot create asset if cwip disabled and account not set (#23584)
* fix: asset purchase with purchase invoice

* chore: allow enable cwip accounting only if cwip account is set

* fix: cannot create asset if cwip disabled and account not set
2020-10-12 14:56:08 +05:30
Marica
72ca041fd2 Merge pull request #23480 from rohitwaghchaure/fixed-incorrect-operation-time-calculation
fix: incorrect operation time calculation for batch size
2020-10-12 14:55:01 +05:30
Rohit Waghchaure
1270c53dea fix: not able to do overproduction 2020-10-12 14:54:54 +05:30
Marica
cedbaa5ac9 Merge branch 'version-12-hotfix' into fixed-incorrect-operation-time-calculation 2020-10-12 14:54:44 +05:30
Marica
b3f0488dca Merge branch 'version-12-hotfix' into item-attribute 2020-10-12 14:51:18 +05:30
Deepesh Garg
772ccde33f fix: Mode of payment getting overwritten by defautl mode of payment for returns 2020-10-12 13:32:49 +05:30
Deepesh Garg
3ca57e493a fix: Do not consider opening entries for TDS calculation (#23598) 2020-10-12 13:03:25 +05:30
Anupam
dc68b44596 fix: can't save item price after adding child table 2020-10-12 11:53:19 +05:30
Anupam
6297778a6a feat: validate if removed item attributes exist in variants 2020-10-12 11:00:28 +05:30
rohitwaghchaure
6825d5442f Merge pull request #23544 from tundebabzy/version-12-hotfix
fix: pass self.flags.ignore_permissions to the ignore_permissions argument of Address and Contact
2020-10-10 11:11:28 +05:30
rohitwaghchaure
5bbb793803 Merge pull request #23571 from nextchamp-saqib/si-dashboard-fix-v12
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-10 11:08:55 +05:30
Saqib
5d7c9d2f61 fix: update items after submission ignores precision (#23492)
* fix: update items after submission ignores precision

* chore: add test
2020-10-09 21:19:40 +05:30
Saqib Ansari
a7293407bd fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard 2020-10-09 21:01:31 +05:30
Rohit Waghchaure
4968f162bd fix: negative stock error while submitting stock reco for batch item 2020-10-09 18:34:13 +05:30
Marica
a8f9e2ab37 Merge pull request #23565 from marination/v12-fix-financial-statement-print-format
fix: Show total row in print format of financial statement
2020-10-09 14:50:29 +05:30
Anupam
15717490fd fix: project value is missing from procurement-tracker 2020-10-09 14:18:42 +05:30
Suraj Shetty
eef5c5dad4 fix: Show total row in print format of financial statement 2020-10-09 13:52:34 +05:30
Tunde Akinyanmi
65a716dd08 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into version-12-hotfix 2020-10-09 07:24:23 +01:00
Marica
9039e29a8c Merge branch 'version-12-hotfix' into fixed-incorrect-operation-time-calculation 2020-10-08 14:06:13 +05:30
Saqib
7c760f62c3 fix: 'stock_rbnb_currency' referenced before assignment (#23528) 2020-10-08 13:49:07 +05:30
rohitwaghchaure
f64adc8acf Merge pull request #23547 from frappe/account_settings_v12
fix: Typo in Accounts Settings
2020-10-08 11:25:32 +05:30
rohitwaghchaure
5da98cce86 Update test_work_order.py 2020-10-08 11:19:41 +05:30
michellealva
5f3e5c8a7c fix: Typo in Accounts Settings 2020-10-08 09:41:44 +05:30
Tunde Akinyanmi
78a98030ef fix: pass self.flags.ignore_permissions to the ignore_permissions
argument of Address and Contact controller
2020-10-08 02:19:02 +01:00
rohitwaghchaure
41b88eafe0 Merge pull request #23536 from rohitwaghchaure/fixed-cogs-error-in-pr
fix: COGS validation in the purchase receipt
2020-10-07 19:08:49 +05:30
Rohit Waghchaure
3f505b711d fixed: COGS validation in the purchase receipt 2020-10-07 19:06:15 +05:30
Raffael Meyer
65ff74778d Merge branch 'version-12-hotfix' into v12-hotfix-get_pricing_rule 2020-10-07 09:47:53 +02:00
Deepesh Garg
81b47821b7 Merge pull request #23354 from deepeshgarg007/tax_fetch_quote_v12
fix: Taxes not getting fetched from Opportunity to Quotation
2020-10-06 19:55:38 +05:30
Rohit Waghchaure
f0108b42fd refactor: added new filters in the Batch-wise balance history report 2020-10-06 13:47:03 +05:30
Rohit Waghchaure
20262e00df feat: balance serial nos in stock leder report 2020-10-06 12:50:21 +05:30
rohitwaghchaure
448af6a893 Merge pull request #23484 from marination/item-attr-fix
fix: Handle Blank from/to range in Numeric Item Attribute
2020-10-06 12:00:36 +05:30
Rohit Waghchaure
1c826afa01 fix: incorrect operation time calculation for batch size 2020-10-05 16:57:21 +05:30
Deepesh Garg
ad4b421251 Merge pull request #23463 from rohitwaghchaure/skip-non-apply-tds-invoices
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-10-05 14:21:48 +05:30
rohitwaghchaure
748585c9a9 Merge pull request #23512 from marination/sales-order-project-fix
fix: Show Project under Create button in SO
2020-10-05 13:17:57 +05:30
marination
6e1d818c3e fix: Show Project under Create button in SO 2020-10-05 12:36:55 +05:30
Faris Ansari
a246b1db20 Merge pull request #23508 from rohitwaghchaure/item-configure-performace-issue
fix: performance issue while adding template item in the cart
2020-10-05 11:45:49 +05:30
Rohit Waghchaure
5056fbcb9d fix: performance issue while adding template item in the cart 2020-10-04 20:14:53 +05:30
Saqib
8aad02f822 fix: naming series - cannot reset current value to zero (#23505) 2020-10-04 18:13:58 +05:30
Rohit Waghchaure
feade95a26 fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled 2020-10-03 16:16:24 +05:30
marination
fe0ce60d75 fix: Handle Blank from/to range in Numeric Item Attribute 2020-10-02 12:28:41 +05:30