Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,697 Commits 3 Branches 0 Tags
Commit Graph

5234 Commits

Author SHA1 Message Date
Wolfram Schmidt
a97715e464
Update customs_tariff_number.json 2020-06-26 10:24:48 +02:00
Wolfram Schmidt
7f2a3e8c7d
Update customs_tariff_number.json 
Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.
 2020-06-25 13:56:32 +02:00
marination
f311f52f6e fix: Disable Renaming in Serial No 2020-06-25 16:02:18 +05:30
John Clarke
6fd1068af3
Update stock_ageing.py 2020-06-24 07:31:21 -06:00
Deepesh Garg
51ce1e1d4e fix: Test Cases 
(cherry picked from commit ded3ab1cd778389ab348bcb5628379f129a8d02d)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
12f1f8e111 fix: Move check from Stock Settings to Company Master 
(cherry picked from commit 53d5d16abb52790d60c0ef050a9c7a6685fbc5df)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
6e2ca779c5 feat: Accounting entries for service item in Purchase receipt 
(cherry picked from commit c258ac82c58f5937a0f5fcd564ef624f5ec6227a)
 2020-06-24 05:38:32 +00:00
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting 2020-06-24 10:23:23 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract (#22386) 
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-06-23 10:42:32 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item (#22393) 2020-06-23 10:32:51 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Deepesh Garg
ded3ab1cd7 fix: Test Cases 2020-06-22 09:40:15 +05:30
Deepesh Garg
c70eb30e7e Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting 2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb fix: Move check from Stock Settings to Company Master 2020-06-20 11:55:56 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055) 
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-19 15:33:21 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis 
fix: Travis(develop)
 2020-06-15 16:12:10 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address 
fix: Billing address in for Purchase documents
 2020-06-14 15:10:43 +05:30
Deepesh Garg
6760077674 fix: Billing address in for Purchase documents 2020-06-13 22:40:23 +05:30
John Clarke
15e4ea0472
Merge branch 'develop' into clarkejj-patch-1 2020-06-12 07:55:49 -06:00
John Clarke
85f237257a
Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case 2020-06-12 07:22:14 -06:00
Deepesh Garg
c258ac82c5 feat: Accounting entries for service item in Purchase receipt 2020-06-12 18:33:42 +05:30
John Clarke
677978dd00
Update stock_ageing.py 
As reviewer Deepesh Garg advised thanks!  batch[0] can be int of float - see line 49 - so change proposed cint to flt
 2020-06-12 05:53:24 -06:00
Alirio Castro
faf33072c8 fix: key was mispelled 2020-06-11 23:32:53 -04:00
John Clarke
6b55f66f02
Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ 
Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605
 2020-06-11 10:24:48 -06:00
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
Rohan
d60d2e1826
fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781) 
* fix: only auto-set serial nos and batches if allowed in Stock Settings

* fix: bug with setting disabled batch no in Pick List

* fix: remove auto-set batch variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-10 19:10:56 +05:30
rohitwaghchaure
3a9c1b23db
Merge pull request #22096 from marination/valuation-rate 
fix: '>=' not supported between instances of 'str' and 'int'
 2020-06-10 14:12:13 +05:30
marination
f5b9deea5b fix: Finished Product Valuation at Repack 2020-06-08 13:02:00 +05:30
Deepesh Garg
407c7bc113
Merge pull request #22067 from marination/item-attribute 
fix: Misleading Error message for Item Attribute.
 2020-06-05 11:21:08 +05:30
P-Froggy
6f87f97efe
fix: Wrong Ordered-Status Indicator for Material Request Items (#22118) 
The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status.
The qty field used in the code is not in stock uom while the ordered_qty field is.
Now, the stock_qty field is used for correct comparison with ordered_qty.
 2020-06-05 10:57:07 +05:30
marination
6f7e9d2904 fix: '>=' not supported between instances of 'str' and 'int' 2020-06-03 17:13:58 +05:30
Myuddin khatri
9276d16420 fix(stock): able to create purchase invoice from purchase receipt dashboard 
able to create purchase invoice from purchase receipt dashboard
 2020-06-03 11:22:49 +05:30
marination
0df7f0fe9d fix: Misleading Error message for Item Attribute. 2020-06-01 11:56:33 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecfb51675d7182588001bb3c1d581f415.
 2020-05-30 11:38:04 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes (#21965) 
* fix: Buying Module fixes

* fix: Delete Report files as well

* fix: Add Purchase Order Analysis to Stock & Accounting
 2020-05-27 20:56:39 +05:30
Marica
a49f045d14
fix: Grammar fixes (#21970) 2020-05-27 20:28:37 +05:30
Rohan
d28854b3c2
fix: throw error if no serial numbers are found in Pick List (#21915) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-26 18:13:25 +05:30
Marica
74a910ae92
fix: title for onboarding step (#21933) 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-05-26 17:49:34 +05:30
Marica
07f305a1d6
refactor: open link in new tab (#21910) 2020-05-25 16:30:59 +05:30
Rohan
e5395c3ae8
fix: filter batches based on item and warehouse in Pick List (#21780) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 15:25:21 +05:30
Marica
dd3e52184c
fix: Added Inactive serial no status (#21848) 2020-05-22 10:48:35 +05:30
rohitwaghchaure
7978907cc8
feat: BOM template (#21262) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-21 18:10:13 +05:30
marination
7afee887a8 fix: Fetch customer into Delivery Note from Pick List 2020-05-21 13:11:48 +05:30
Nabin Hait
939441117a Merge branch 'marination-purchase-dashboard' into develop 2020-05-19 20:22:48 +05:30
Nabin Hait
e005078c0d feat: buying module dashboard and onboarding 2020-05-19 20:22:25 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-19 19:51:45 +05:30
Nabin Hait
ddec05ee07 Merge branch 'marination-stock-dashboard' into develop 2020-05-19 19:08:58 +05:30