Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,450 Commits 3 Branches 0 Tags 1 GiB
2735701aab
Commit Graph

21450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
0f5c18ca81 [Fix] For non stock item, not able to place an order from shopping cart (#12758) 2018-02-05 12:25:02 +05:30
rohitwaghchaure
a4c40e0fd6 [Fix] After accesing POS page, it does not work when going back from another page (#12763) 2018-02-05 12:24:06 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
Nabin Hait
59aca770c1 Merge branch 'hotfix' 2018-02-03 09:13:12 +05:30
Nabin Hait
9d2f04139c bumped to version 10.0.19 2018-02-03 09:43:12 +06:00
rohitwaghchaure
151834d746
Merge pull request #12741 from Helkyd/develop 
Update Trial balance
 2018-02-02 22:29:21 +05:30
Helkyd
5e93b02c85
Update trial_balance.py 
Assuming that Account_number has NUMBERs will sort.
 2018-02-02 12:27:30 +00:00
Saurabh
70d972d92e [Mod] Added descriptions to alert about reselecting the option in 'primary_address_and_contact_detail' 2018-02-02 16:18:17 +05:30
Saurabh
41c47e3ffa
Merge pull request #12677 from tundebabzy/issue-12535-1 
Website Cart Should Not Show Expired Items As 'In Stock' #12535
 2018-02-02 15:58:07 +05:30
rohitwaghchaure
cf6360d825
Merge pull request #12739 from jay-parikh/hotfix 
Enable/Disable Discount in POS using POS Profile #11748
 2018-02-02 13:12:38 +05:30
Jay Parikh
2c95ab3897 Code fix for Enable/Disable Discount in POS using POS Profile #11748 2018-02-01 22:52:58 -08:00
Jay Parikh
171e5af995 Fixed indentation issue in pull # 11748 2018-02-01 21:39:20 -08:00
tundebabzy
5df64d84a1 code review fix 2018-02-01 17:05:54 +01:00
tundebabzy
a829d5a4d5 Merge branch 'hotfix' into issue-12535-1 2018-02-01 16:56:05 +01:00
Helkyd
b258686b00
Update trial_balance.py 
Fix to order only if account starts with Number ... while for others not required....
 2018-02-01 15:53:30 +00:00
Nabin Hait
91c5e4c429
Validate rate in PO with supplier quotation only if checking is enabled via Buying Settings (#12734) 2018-02-01 18:58:22 +05:30
Nabin Hait
cae13bf048
Fixes in purchase register report (#12737) 2018-02-01 18:58:14 +05:30
Nabin Hait
2aba97bff1 Fetch items from BOM in Material Request 2018-02-01 18:52:50 +05:30
Jay Parikh
d4359faa31 Enable/Disable Discount in POS using POS Profile #11748 2018-02-01 04:26:24 -08:00
rohitwaghchaure
c830344ca7
Merge pull request #12738 from rohitwaghchaure/hotfix_pos_issue 
[Fix] Pay button not working in pos
 2018-02-01 17:39:33 +05:30
Rohit Waghchaure
d85247cd7a [Fix] Pay button not working in pos 2018-02-01 17:18:38 +05:30
rohitwaghchaure
441032d39c
Merge branch 'develop' into develop 2018-02-01 16:54:10 +05:30
Nabin Hait
b9ce104b09
Opening balance in stock ledger report (#12729) 2018-02-01 14:58:50 +05:30
Saurabh
7c8d508e28 [Mod] Dependant on complete_address field and loads updated mobile_no,address in onload method 2018-02-01 14:40:49 +05:30
Saurabh
df8add272c Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-01 14:02:09 +05:30
Raghavendra Kamath
2afa8277a7 Update Readme to add new erpnext logo (#12728) 2018-02-01 11:53:01 +05:30
Nabin Hait
7ba092eaf9
Fixes for making stock entry against Pro Order (#12721) 2018-02-01 10:51:27 +05:30
Saurabh
f16d45b0a0 Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 
Resolved Conflicts:erpnext/selling/doctype/customer/customer.json
 2018-02-01 02:05:30 +05:30
Rushabh Mehta
82fa04ce32
Update projects.py 2018-01-31 22:20:14 +05:30
Saurabh
9f5c2002ff [Mod] Removed the Dependency on Frappe PR 
[Fix] Fixed a possible bug
 2018-01-31 17:43:58 +05:30
rohitwaghchaure
32a5f38595
Merge pull request #12633 from vishdha/issue_12388 
[fix] Sales order link to purchase order not working fixed
 2018-01-31 17:30:43 +05:30
tundebabzy
4990cf7783 remove stray code 2018-01-31 11:35:56 +01:00
Saurabh
9f29f60707
Merge pull request #12581 from britlog/website-product-spinner 
[Website] Add number spinner for quantities in product page
 2018-01-31 15:58:04 +05:30
Nabin Hait
ec2c9ec897 Merge branch 'master' into develop 2018-01-31 15:39:16 +05:30
Nabin Hait
8f38a17c14 Merge branch 'hotfix' 2018-01-31 15:39:15 +05:30
Nabin Hait
bff1971bb2 bumped to version 10.0.18 2018-01-31 16:09:15 +06:00
Zarrar
4e05f02038 error in throw message rectify (#12719) 2018-01-31 15:33:51 +05:30
Nabin Hait
7918b92d95 Invalid date value comparison, fixes for mariadb 10.2.3+ 2018-01-31 15:30:03 +05:30
tundebabzy
29c8142678 refactor adjust_for_expired_items and others as per code review 
use get_all instead of get_list

rename `adjust_for_expired_items` to `adjust_qty_for_expired_items`
 2018-01-31 10:51:06 +01:00
vishdha
df1653827f [fix] Patch for material request to purchase order added 2018-01-31 15:11:24 +05:30
Vishal
fc05cc4e70 [fix] link with supplier quotation to purchase order 2018-01-31 15:10:39 +05:30
Vishal
4dc329f5ea [fix] Sales order link to purchase order not working fixed 2018-01-31 15:10:39 +05:30
Nabin Hait
e37e5d6134 minor fix in patch for mariadb version 2018-01-31 15:00:18 +05:30
rohitwaghchaure
2056ea6fb4
Update customer.js 2018-01-31 14:48:53 +05:30
Zarrar
dea99cc3a8 treeview not set when routed from bom form (#12707) 2018-01-31 13:07:04 +05:30
Kenneth Sequeira
f6daf56054 Added Tutorial Videos for Education in User Manual (#12678) 
* added erpnext education tutorial videos to the manual

* testing with div

* Update program-enrollment.md

Properly ended YouTube video.

* removed group assessment criteria page
 2018-01-31 12:49:58 +05:30
Achilles Rasquinha
6ceffbd2f8
Merge pull request #12710 from achillesrasquinha/12704 
Python 3 Compatible Fixes.
 2018-01-31 11:23:05 +05:30
Nabin Hait
bc640fe6a6 minor fix in old patch 2018-01-30 19:26:28 +05:30
saurabh-bhosale
0c9a99a953
Merge branch 'develop' into show_address_in_online_pos 2018-01-30 17:48:12 +05:30
Achilles Rasquinha
39f3d7e3aa local import 2018-01-30 16:58:49 +05:30