Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,925 Commits 3 Branches 0 Tags 1 GiB
182f4def00
Commit Graph

259 Commits

Author SHA1 Message Date
Suraj Shetty
182f4def00 fix: Delivery note creation from pick list 
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-16 08:16:22 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
Mangesh-Khairnar
558a5c199f fix(price list): change the field name 2019-06-24 17:32:04 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop 
fix: set COGS for material issue only
 2019-06-10 16:57:23 +05:30
Rohit Waghchaure
9a792c2eed stock_entry: set COGS for material issue only 2019-06-07 15:20:36 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
rohitwaghchaure
fd4815da53
Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12 
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
 2019-05-23 15:04:43 +05:30
Rohit Waghchaure
c41118bac7 Get default warehouse from the stock settings in the get_item_details 2019-05-21 15:21:13 +05:30
Nabin Hait
06c8cf4321 fix: BOM Item rate based on uom conversion factor and exchange rate 2019-05-16 19:23:00 +05:30
Suraj Shetty
c87b47a575
fix: Price list conversion for other UOM from stock UOM item price (#17386) 
* fix: Price list for UOM other than stock UOM

-Fixes conversion from default UOM item price to  other UOMs

* fix: Typo
 2019-04-29 23:18:47 +05:30
Rohit Waghchaure
e8e3fb175d fix: incorrect POS profile selected 2019-04-05 09:57:52 +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
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +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
Frappe Bot
1fcae10258 Merge branch 'master' into develop 2019-02-28 10:20:48 +00:00
Rohit Waghchaure
b48effebce fix: test case 2019-02-27 19:33:22 +05:30
Rohit Waghchaure
cd34c70670 fix: bom cost update is not working 2019-02-27 18:01:30 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Nabin Hait
0d1ccc357f fix: get item details 2019-02-14 18:30:10 +05:30
Saif Ur Rehman
590491779a Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/item.py
 2019-02-02 02:49:04 +05:00
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-02-01 19:17:04 +05:00
Saif Ur Rehman
c8b61007b0 Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults 
# Conflicts:
#	erpnext/setup/doctype/brand/brand.json
#	erpnext/stock/get_item_details.py
 2019-02-01 17:05:46 +05:00
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
4e45663297 fix(stock): get item price based on party 2019-01-29 14:02:08 +05:30
Nabin Hait
01ca3e5e36 fix(manufacturing): Get raw materials rate from price list ignoring party 2019-01-25 16:25:15 +05:30
Saif Ur Rehman
398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-01-18 17:33:19 +05:00
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Nabin Hait
158e7dcd8b fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM 2019-01-16 16:00:25 +05:30
Zlash65
a3dd798bad clean if conditions 2019-01-15 16:05:42 +05:30
Zlash65
627be1de51 minor fixes for deferred calculations 2019-01-15 14:16:50 +05:30
Fisher Yu
2cd49f51e2 fix issue #16284, child table copy (#16285) 
* fix issue #16284, child table copy 

V11 Child table from Clipboard Excel error, can't multiply sequence by non-int of type 'float'

* Update get_item_details.py

consider the empty string case

* Update get_item_details.py
 2019-01-11 15:31:33 +05:30
Nabin Hait
afbdaa525e
Merge pull request #16365 from hiousi/patch-1 
fix: variant can not get its price
 2019-01-10 10:36:27 +05:30
Saif Ur Rehman
2689dea72a fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse 2019-01-09 13:43:06 +05:00
Saif Ur Rehman
eb7277d2d4 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/patches.txt
 2019-01-09 11:25:53 +05:00
hiousi
9671438435
Update get_item_details.py 2019-01-08 22:23:45 +01:00
hiousi
1516e29609
[fix] variant can not get its price 
get_price_list_rate() return empty dict before trying to get the item price for a variant.
 2019-01-08 18:34:08 +01:00
rohitwaghchaure
ffdadbf97f fix: fallback to stock uom if uom is not defined (#16329) 
* [minor] Code cleanup

* fix: remove 'or' condition, won't execute
 2019-01-08 16:21:25 +05:30
Saif Ur Rehman
648bd15b2a Force item_tax_rate on setting item details server-side 2019-01-03 04:03:54 +05:00
Saif Ur Rehman
eeead1d777 fix: Only load transaction's company's tax accounts in item tax map 2018-12-29 02:25:00 +05:00
Saif Ur Rehman
c819ea38a0 -Added Item Default child table for Brand 
-Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand
-Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults
 2018-12-27 23:01:54 +05:00
Saif Ur Rehman
677866824a More work on Tax Category and Item Tax Template 2018-12-27 02:11:07 +05:00
Suraj Shetty
1eb098caf9 Add additional condition condition to get_pos_profile 
- If we have any POS Profile related to the user,
that profile should be used
 2018-11-21 14:36:58 +05:30
Zarrar
e83ff38c10 [Enhance] Deferred Expense (#15437) 
* added section for deferred expense in item master

* added default expense account field in Company master

* added deferred expense section in purchase invoice item

* validation and getter code added

* scheduler event to book expense every month

* codacy, import fix and other minor fixes

* rectify debit credit logic for expense

* commonify js code for deferred expense and revenue

* remove deferred calculation and validation

* common file to calculate deferred revenue and expense

* codacy fixes

* expense account root_type - Asset, specific method naming
 2018-09-21 15:45:40 +05:30
Sagar Vora
508189eaea Use default conversion factor if not found in Item (#15369) 2018-09-11 17:22:25 +05:30
Nabin Hait
b479a87031 fix(report): Cost center filters in financial statements and general ledger 2018-09-07 13:17:23 +05:30
Nabin Hait
b259e3eb06 Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date 2018-08-31 12:39:46 +05:30
Nabin Hait
9983d41fb0 Fixed divison error 2018-08-30 19:10:36 +05:30
Rushabh Mehta
49f9747385 major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) 
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc

* fix: remove debug
 2018-08-30 18:50:48 +05:30
Zlash65
80f5cb05cc fixes in setting end_date and manual provision of start&end date 2018-08-30 10:39:48 +05:30
Zlash65
4ce8c7f383 end date should reset if start date is changed 2018-08-30 10:39:48 +05:30