Marica
299e217668
fix: Blanket Order in SO/PO child tables ( #21442 )
2020-04-28 13:00:04 +05:30
rohitwaghchaure
4d754eadc8
Merge branch 'develop' into quo-status-fix
2020-04-27 00:22:43 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat
2020-04-25 17:37:24 +05:30
Saqib
8952ac1ab4
fix: custom buttons are hidden if order type of SO is customised ( #21397 )
2020-04-25 09:44:21 +05:30
Saqib
63084c6292
Merge branch 'develop' into quo-status-fix
2020-04-23 15:30:31 +05:30
Saqib Ansari
1e4c28e99d
fix: quotation have expired status even if sales order exists
2020-04-23 15:28:47 +05:30
Nabin Hait
5f77854448
Revert "fix : Create Pick List Fos Sales Order List ( #20915 )" ( #21352 )
...
This reverts commit 27c6f69435
.
2020-04-21 14:28:08 +05:30
Dharmraj-48
27c6f69435
fix : Create Pick List Fos Sales Order List ( #20915 )
...
Co-authored-by: Dharmraj <Dharmraj@bloomstack.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:10:09 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions ( #21313 )
2020-04-18 22:13:48 +05:30
Anupam K
790b9ee8d0
Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat
2020-04-18 01:51:47 +05:30
Anupam K
22318b2eb6
Linkedin, Twitter Integration
2020-04-18 01:46:38 +05:30
Marica
8636914e9a
fix: Lead Contact with blank first name via Customer ( #21247 )
2020-04-14 11:53:09 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance
2020-04-07 14:05:05 +05:30
Marica
f55c9c8d8c
Merge branch 'develop' into po_supplier_skip
2020-04-03 18:35:48 +05:30
Deepesh Garg
0f25a40421
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order
2020-04-02 21:30:53 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip
2020-04-02 21:17:52 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom
...
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-31 16:24:37 +05:30
Deepesh Garg
242a079bcb
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order
2020-03-31 14:18:30 +05:30
prafful1234
3fa03df1e3
fix(transaction): Add comment-by from frappe session ( #20867 )
...
Co-authored-by: prafful1234 <prafful@mntechnique.com>
2020-03-31 10:40:42 +05:30
Deepesh Garg
c33412b6ae
feat: Link blanket order and quotation
2020-03-30 22:44:13 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip
2020-03-30 13:07:03 +05:30
Saqib
74864b3b61
fix: currency not fetched on quotation creation ( #20996 )
2020-03-26 13:20:31 +05:30
marination
73c8d23a79
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-20 17:52:28 +05:30
Marica
508ed1e121
fix: Missing if condition in Customer Default Bank Account Validation. ( #20969 )
2020-03-18 11:28:04 +05:30
marination
e1f499ae1b
fix: Pick List Enhancements
2020-03-17 11:47:11 +05:30
Deepesh Garg
eeb1922e37
fix: Add check to skip SO and DN in customer master
2020-03-17 11:43:34 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord ( #20886 )
...
* s_inv has is_pos default set as 1
2020-03-16 17:51:00 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom ( #20843 )
...
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
2020-03-06 11:03:46 +05:30
Deepesh Garg
6d604a151b
fix: Validation message
2020-03-04 11:55:10 +05:30
Lokesh Waingankar
d398c73bc5
fix: Removed html tags in pop up message ( #20603 )
2020-03-03 19:07:51 +05:30
Lokesh Waingankar
38242bc21f
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-03-02 17:45:59 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup ( #20772 )
...
* chore: Item Price and Product Bundle Form cleanup
* fix: Trailing comma
2020-03-02 15:51:14 +05:30
Lokesh Waingankar
efb6482ef6
fix: user is not able to do 'Set as Lost' for Quotation ( #20689 )
2020-02-27 19:08:58 +05:30
Rucha Mahabal
6071313965
fix: document creation via onboarding slide ( #20644 )
...
* fix: defaults not set in doc created via Onboarding Slide
* fix: default company not set in Supplier
2020-02-20 12:57:21 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer ( #20465 )
...
* fix: Label and UX fixes while creating payment entry against customer
* fix: filter
2020-02-03 15:58:50 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Himanshu Warekar
e169d2964c
fix: change fieldtype to Text
2020-01-24 17:40:29 +05:30
KanchanChauhan
a7d1985b5f
fix: Set Quotation expired if not Ordered or Lost ( #20354 )
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-01-21 12:35:11 +05:30
Himanshu
e3afe8a73c
fix: don't hide primary_address_and_contact_detail ( #20322 )
2020-01-16 13:39:29 +05:30
Rohit Waghchaure
ecdfc1a15c
fix: allow on submit for the delivery date field
2020-01-13 12:43:26 +05:30
Pranav Nachnekar
1612432f45
fix: parent item should not appear in raw material request dialog ( #20216 )
2020-01-09 13:32:15 +05:30
Pranav Nachnekar
971458043d
fix: add new delivery note button in Sales Order ( #20199 )
...
* fix: add new delivery note button in Sales Order
* fix: removed debugger
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-01-07 11:29:35 +05:30
Rucha Mahabal
2d293c585e
fix(Subscription): pass start_date while computing next_schedu… ( #20159 )
2019-12-31 19:15:37 +05:30
Saqib
71649fe141
fix: customer credit limit label ( #20152 )
2019-12-31 17:05:34 +05:30
Marica
5483f1a27e
fix: Field 'other_charges_calculation' column type changed. ( #20141 )
2019-12-30 22:20:02 +05:30
thefalconx33
2073eeb8fa
fix: don't allow deletion of items which has work order assigned to it
2019-12-27 16:26:03 +05:30
deepeshgarg007
bd1da65098
fix: Update modified date
2019-12-26 18:26:13 +05:30
deepeshgarg007
0b9a98ad43
fix: Add against blanket order field in sales order
2019-12-26 18:15:13 +05:30