Marica
9cc05bb83e
Merge branch 'develop' into rfq-email
2020-10-12 18:02:15 +05:30
rohitwaghchaure
4164d08d17
Merge pull request #23323 from marination/supplier-quotn-comparison
...
feat: Supplier Quotation Comparison - v3
2020-10-12 17:55:15 +05:30
Marica
73e16ca16a
Merge pull request #23554 from rohitwaghchaure/print-uom-after-quantity-patch
...
fix: added patch to make custom field 'Print UOM after Quantity'
2020-10-12 17:43:39 +05:30
Marica
41067e204c
Merge branch 'develop' into print-uom-after-quantity-patch
2020-10-12 17:32:29 +05:30
Marica
ea1da6e4b8
Merge pull request #23534 from anupamvs/company-issue
...
fix: error log while creating company
2020-10-12 17:25:57 +05:30
Marica
6d935d4e48
Merge branch 'develop' into company-issue
2020-10-12 17:25:12 +05:30
Marica
dc75fe2cb6
Merge pull request #23478 from marination/supplier-quotation-ux
...
feat: Supplier Quotation UX fixes
2020-10-12 17:17:27 +05:30
Marica
14b9c79ddc
Merge branch 'develop' into supplier-quotation-ux
2020-10-12 17:16:28 +05:30
Saqib
b332c5f06f
fix: sales invoice series gets overwritten with pos invoice series ( #23479 )
...
* fix: sales invoice series gets overwritten with pos invoice series
* chore: show is consolidated only if sales invoice is pos
2020-10-12 17:10:37 +05:30
Saqib
ebb0a6266a
fix: last purchase rate in item prices report ( #23506 )
...
* 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:09 +05:30
Saqib
ebbe285872
feat: (report) POS Register ( #23313 )
...
* feat: pos register report
* feat: group by fields in pos register
* chore: add paid amount column
* fix: (minor) remove redundant group by label
2020-10-12 17:02:31 +05:30
rohitwaghchaure
a060f8c00b
Merge pull request #23524 from michellealva/employee_exit
...
fix(Employee): Field level change in Exit section
2020-10-12 16:23:54 +05:30
rohitwaghchaure
14e7656a57
Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status
...
fix: Asset status after maintenance or repair
2020-10-12 16:13:29 +05:30
rohitwaghchaure
80519b1098
Merge pull request #23596 from marination/item-attribute-validation-on-non-template-item
...
fix: Perform Item Attribute Value Validation on Variants Only
2020-10-12 16:12:02 +05:30
Marica
e9f0268d32
Merge branch 'develop' into item-attribute-validation-on-non-template-item
2020-10-12 15:26:34 +05:30
rohitwaghchaure
a57ad47cb8
Merge pull request #23538 from kennethsequeira/spellcheck
...
chore: spell fixes for Condition
2020-10-12 15:25:23 +05:30
Marica
bf0b948d0b
Merge pull request #23362 from marination/mr-ux
...
fix: More MR UX fixes
2020-10-12 15:22:29 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux
2020-10-12 15:17:32 +05:30
rohitwaghchaure
4e59abf0bf
Merge pull request #23583 from anupamvs/item-price
...
fix: can't save item price after adding child table
2020-10-12 15:15:50 +05:30
Rushabh Mehta
2bef986f14
Merge pull request #23450 from michellealva/jc
...
fix: Change Error Message in Work Order
2020-10-12 15:07:21 +05:30
Glen Whitney
6ec3dc5453
fix(asset): cannot create asset if cwip disabled and account not set ( #23580 )
...
* Never add an asset GL entry if CWIP is not enabled
* 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
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
2020-10-12 14:56:55 +05:30
Deepesh Garg
15d46040ff
fix: Do not consider opening entries for TDS calculation ( #23597 )
2020-10-12 12:39:08 +05:30
marination
03975a692e
fix: Perform Item Attribute Value Validation on Variants Only
2020-10-12 12:03:07 +05:30
Kevin Chan
7a86a77322
fix: Asset status after maintenance or repair
...
Fix a bug where an **Asset**'s status is not being set to what it was
previously after an **Asset Repair** or **Asset Maintenance**.
2020-10-12 11:30:36 +08:00
Deepesh Garg
c9ebef4d30
Merge pull request #23567 from nextchamp-saqib/restrict-future-posting
...
chore: do not allow future transactions
2020-10-11 20:55:38 +05:30
Anupam
2be23309bb
fix: can't add child table in item price
2020-10-11 14:14:50 +05:30
Saqib Ansari
3d91d48b77
fix: validate only for stock transactions
2020-10-10 21:56:50 +05:30
rohitwaghchaure
ad9db89514
Merge pull request #23573 from deepeshgarg007/opening_jv
...
fix: Opening Journal Entry via Data Import
2020-10-10 13:16:41 +05:30
Deepesh Garg
e9c1098f5f
Merge pull request #23566 from michellealva/sales_team
...
fix: Change name of Sales Team table
2020-10-10 12:14:00 +05:30
rohitwaghchaure
1bcd84450c
Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk
...
fix: Add lower deduction certificate in desk page
2020-10-10 11:23:26 +05:30
rohitwaghchaure
01e23264a6
Merge pull request #23557 from KanchanChauhan/issue#23475-2
...
feat: Supplier Sourced Items in BOM
2020-10-10 11:17:53 +05:30
rohitwaghchaure
5065f8ac83
Merge pull request #23545 from tundebabzy/develop
...
fix: pass self.flags.ignore_permissions to the ignore_permissions
2020-10-10 11:11:57 +05:30
rohitwaghchaure
04ddf24ffe
Merge pull request #23572 from marination/payment-entry-list-view
...
fix: Check if list view standard filter exists in Payment Entry
2020-10-10 11:09:31 +05:30
rohitwaghchaure
9333a1dd54
Merge pull request #23570 from nextchamp-saqib/si-dashboard-fix
...
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-10 11:08:37 +05:30
rohitwaghchaure
ea8ea4abb5
Merge pull request #23569 from marination/prod-order-reference-in-item
...
fix: Remove Production Order reference from Item Validation
2020-10-10 11:03:26 +05:30
Kanchan Chauhan
654c36ea99
feat: Supplier Sourced Items in BOM
2020-10-09 22:05:03 +05:30
Deepesh Garg
2676f96203
fix: Opening Journal Entry via Data Import
2020-10-09 21:58:38 +05:30
marination
07731c7735
fix: Check if list view standard filter exists in Payment Entry
2020-10-09 21:44:23 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision ( #23491 )
...
* fix: update items after submission ignores precision
* chore: add test
2020-10-09 21:19:25 +05:30
Saqib Ansari
d927c8efba
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-09 21:00:33 +05:30
marination
bd6d5eb5ac
fix: Remove Production Order reference from Item Validation
2020-10-09 20:57:17 +05:30
michellealva
1bc7fc41a5
fix: Change name of Sales Team table
2020-10-09 16:01:13 +05:30
Saqib Ansari
776d8f72cf
chore: do not allow future transactions
2020-10-09 15:36:11 +05:30
Anupam
22dc42efb9
fix: error log while creating company
2020-10-09 14:58:39 +05:30
Tunde Akinyanmi
f2b12a3b9c
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-10-09 07:20:19 +01:00
Rucha Mahabal
a6dc7833f6
Merge pull request #23537 from michellealva/missing_links
...
fix: Add links in Stock desk page
2020-10-09 11:46:14 +05:30
Deepesh Garg
5e6ea36938
fix: Add lower deduction certificate in desk page
2020-10-08 20:32:36 +05:30
Rohit Waghchaure
a86cab0bb2
fix: added patch to make custom field 'Print UOM after Quantity'
2020-10-08 16:41:23 +05:30
Deepesh Garg
c837b5f48c
Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition
...
feat(Accounts): Add Condition Field In Pricing Rule
2020-10-08 16:32:21 +05:30
Abhishek Balam
783cdc1c1f
Merge pull request #23523 from michellealva/budget
...
fix(Budget): Change options in select field
2020-10-08 16:27:31 +05:30