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

2605 Commits

Author SHA1 Message Date
Faris Ansari
581e5fbfda fix: Set default value for Packing Unit as 0 
The default value 1 assumes Items will be always packed in integer
quantities. This is not the usual case.
 2019-04-12 12:39:12 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold 2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold 
Feature: Purchase order on hold
 2019-04-11 15:36:54 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Rohit Waghchaure
9665a531fc fix: item variant test cases 2019-04-11 09:56:00 +05:30
Rohit Waghchaure
f3a9552e48 fix: item variant test cases 2019-04-10 17:57:09 +05:30
Mangesh-Khairnar
16c4fd6733 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-04-09 12:13:45 +05:30
Nabin Hait
f1698bb2df fix: unique variant based on 2019-04-08 14:59:43 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order 
feat: provision to unlink advance payment entry on cancelation of order
 2019-04-06 12:30:05 +05:30
Nabin Hait
843e440191
Merge branch 'hotfix' into validate_stock_transaction_v11 2019-04-05 15:41:26 +05:30
Mangesh-Khairnar
3d667b4c94 Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold 2019-04-05 12:11:26 +05:30
Nabin Hait
a3357e4e86 fix: Default variant Based on 2019-04-05 12:10:36 +05:30
Himanshu Warekar
cdd79e3c40 fix: check transactions for batch, serial check 2019-04-04 15:26:35 +05:30
Himanshu Warekar
7f253b679a pull from hotfix 2019-04-04 15:19:44 +05:30
Himanshu Warekar
28db545947 fix: check transactions for batch, serial check 2019-04-04 15:02:25 +05:30
Nabin Hait
2df623c693
Merge pull request #17072 from kennethsequeira/auto-re-val 
fix: spelling in validation message for Auto-reorder
 2019-04-04 11:40:08 +05:30
Nabin Hait
1e5664ba5f
Update item.py 2019-04-04 11:39:55 +05:30
Rushabh Mehta
3720e64506 fix(kaizen): warehouse account description 2019-04-04 09:02:41 +05:30
Rushabh Mehta
1f0edabda8 fix(kaizen): warehouse account description 2019-04-04 08:58:34 +05:30
Rohit Waghchaure
5fa9a7a1b4 feat: unlink advance payment entry on cancelation of order 2019-04-01 00:40:38 +05:30
Kenneth Sequeira
4f5839eb65 fixed spelling in validation message 
fixed typo in auto-reorder validation message
 2019-03-30 15:37:51 +05:30
rohitwaghchaure
725f37cea5
Revert "fix(Delivery Note): Fix issue credit note" 2019-03-30 13:21:50 +05:30
rohitwaghchaure
f3a1fa0bae
Revert "Fix(Delivery Note): Fix issue credit note" 2019-03-30 12:33:54 +05:30
rohitwaghchaure
b6505bddeb
Merge pull request #17025 from hrwX/fix_issue_credit 
fix(Delivery Note): Fix issue credit note
 2019-03-30 12:31:29 +05:30
rohitwaghchaure
5fdbdd50f9
Merge pull request #16950 from hrwX/fix-issue-credit 
Fix(Delivery Note): Fix issue credit note
 2019-03-30 12:31:18 +05:30
Rushabh Mehta
c4599c21c3 fix(test): item variant 2019-03-29 18:30:00 +05:30
Rushabh Mehta
048e5f44b5 fix(test): item variant 2019-03-29 14:34:14 +05:30
Nabin Hait
d4e038b6ca Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop 2019-03-29 12:41:48 +05:30
Nabin Hait
0a90ce5cf6 Refactored deferred revenue booking logic 2019-03-28 19:43:02 +05:30
Himanshu Warekar
a86f3a7d80 remove issue credit note 2019-03-27 10:01:18 +05:30
Nabin Hait
8aaee57921 fix(uom): Get items as per UOM defined in BOM, fixes #15081 2019-03-26 16:53:13 +05:30
Rohit Waghchaure
5816fc2801 Renamed subcontract to Send to Subcontractor 2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428 renamed purpose in stock entry 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46 fix: test cases 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
9faed1b433 feat: added button get items from material request in stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
8ce2d50706 Added test cases 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
186c758087 feat: added good in transit feature in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
1f2f9cf360 feat: added stock entry type master to select purpose in the stock entry 2019-03-26 12:52:31 +05:30
Mangesh-Khairnar
324e06cba0 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-03-25 18:51:13 +05:30
Mangesh-Khairnar
5e474f4664 fix: add server-side validation for closed sales order for linked material request 2019-03-25 17:28:20 +05:30
Nabin Hait
95705412f3 fix(uom): Get items as per UOM defined in BOM, fixes #15081 2019-03-22 13:19:17 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 
feat: Brand Item Defaults (v12)
 2019-03-22 12:46:04 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
Himanshu Warekar
2f5f17fcbb refactor: fix issue credit note 2019-03-18 21:46:26 +05:30
Mangesh-Khairnar
873c579bb4 fix: check for both hold and closed status in po 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
a1afd78723 feat: add validation for on hold purchase order 2019-03-18 12:14:25 +05:30
Rohit Waghchaure
821a002125 feat: added provision to disable CWIP accounting in asset settings 2019-03-08 10:51:37 +05:30
Saif Ur Rehman
e62bd893c5 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/test_item.py
 2019-03-08 01:29:39 +05:00