Nabin Hait
|
7ec8a2eae0
|
Merge branch 'chdecultot-asset_depreciation_based_on_fiscal_year' into develop
|
2018-02-07 18:25:57 +05:30 |
|
Nabin Hait
|
ed26028a93
|
Minor fixes for depr based on FY
|
2018-02-07 18:25:45 +05:30 |
|
Nabin Hait
|
82a61c3bd9
|
Deleted restaurant order entry test cases
|
2018-02-07 16:56:07 +05:30 |
|
Nabin Hait
|
c224d34a2c
|
Merge branch 'master' into develop
|
2018-02-07 16:07:20 +05:30 |
|
Nabin Hait
|
0725eab858
|
Merge branch 'hotfix'
|
2018-02-07 16:07:19 +05:30 |
|
Nabin Hait
|
67d6dc1ac6
|
bumped to version 10.0.20
|
2018-02-07 16:37:19 +06:00 |
|
Nabin Hait
|
33f967d97c
|
Account name length fixed in HUngary and Germen COA
|
2018-02-07 16:00:42 +05:30 |
|
Nabin Hait
|
e2aec86bfa
|
Merge branch 'mntechnique-pos_pf_with_draft_status' into develop
|
2018-02-07 12:40:56 +05:30 |
|
Nabin Hait
|
4b1bd15f7e
|
Draft status in pos print format
|
2018-02-07 12:40:45 +05:30 |
|
rohitwaghchaure
|
9a5037193f
|
Removed DR/CR from balance column (#12791)
* Removed DR/CR from balance column
* Update general_ledger.html
* Update general_ledger.py
|
2018-02-07 12:10:14 +05:30 |
|
Shreya Shah
|
80423de611
|
posting date in journal entry should not be nowdate (#12801)
|
2018-02-07 12:08:08 +05:30 |
|
Manas Solanki
|
b4693c6957
|
fix for making the invoice from the timesheet (#12803)
|
2018-02-07 12:07:27 +05:30 |
|
rohitwaghchaure
|
ba31369764
|
Merge pull request #12773 from rohitwaghchaure/change_amount_issue
[Fix] Incorrect change amount if enabled rounded total
|
2018-02-06 17:27:04 +05:30 |
|
Saurabh
|
50f7e29814
|
[New] Added Draft status in POS Invoice print formats if a Draft POS Invoice is printed
|
2018-02-06 00:23:21 +05:30 |
|
Rohit Waghchaure
|
e8d22bb999
|
[Fix] Incorrect change amount if enabled rounded total
|
2018-02-05 18:13:29 +05:30 |
|
Nabin Hait
|
211b6c1fd7
|
Merge branch 'vishdha-gstr2_report' into develop
|
2018-02-05 16:10:16 +05:30 |
|
Nabin Hait
|
b02c109e1d
|
Cleanup and fixes on GSTR-2
|
2018-02-05 16:09:51 +05:30 |
|
Vishal Dhayagude
|
cce29fabf4
|
[fix] validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry (#12767)
|
2018-02-05 12:25:51 +05:30 |
|
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
|
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 |
|
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 |
|
Rushabh Mehta
|
82fa04ce32
|
Update projects.py
|
2018-01-31 22:20:14 +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 |
|