Commit Graph

21366 Commits

Author SHA1 Message Date
Nabin Hait
b0819b528f
Minor fixes in gstr reports (#12848) 2018-02-09 15:30:55 +05:30
rohitwaghchaure
2bdc4ce70d
Merge pull request #12831 from PawanMeh/fixes_12829
Add Total Qty to online POS
2018-02-09 14:49:21 +05:30
rohitwaghchaure
7e75165826
Merge branch 'develop' into fixes_12829 2018-02-09 12:01:41 +05:30
pawan
081f40c1bf readded pos.css 2018-02-09 11:56:32 +05:30
Achilles Rasquinha
05bf8abab0
Merge pull request #12835 from manassolanki/education-docs
updated the docs for education
2018-02-09 10:37:54 +05:30
Manas Solanki
458a4e13bd updated the docs for education 2018-02-08 20:12:41 +05:30
pawan
1583120a54 remove pos.css 2018-02-08 20:00:12 +05:30
pawan
83b1b802d1 print hide and pos.less changes 2018-02-08 19:56:12 +05:30
pawan
33571dc567 print hide changes 2018-02-08 19:35:48 +05:30
pawan
31d37f110a print hide changes 2018-02-08 19:25:30 +05:30
Pawan Mehta
e2bc8bb644
Update sales_invoice.json 2018-02-08 16:35:03 +05:30
pawan
735b8c6094 [fix] #12829 2018-02-08 16:20:46 +05:30
Saurabh
ab8c7e616e resolved merge conflicts 2018-02-08 15:17:15 +05:30
Saurabh
f4211c4a52 Merge branch 'hotfix' 2018-02-08 15:04:25 +05:30
Saurabh
c1f982a9bb bumped to version 10.0.21 2018-02-08 15:34:25 +06:00
rohitwaghchaure
4d250585a6
Merge pull request #12824 from netchampfaris/hotfix-advance_payment
[hotfix] Advance Total validation
2018-02-08 14:32:29 +05:30
Faris Ansari
6041f5cb8c [hotfix] Advance Total validation 2018-02-08 13:33:52 +05:30
rohitwaghchaure
144c9977a2
Merge pull request #12819 from netchampfaris/hotfix-get_party_account
get_party_account only if company is set
2018-02-08 11:42:41 +05:30
rohitwaghchaure
f1fa338999
Merge pull request #12816 from mntechnique/hotfix-for-#12810
Does not allow discount over 100% in POS
2018-02-08 11:42:08 +05:30
Faris Ansari
f7717b9ec2 get_party_account only if company is set 2018-02-08 11:11:21 +05:30
Prateeksha Singh
152bf37e7f
Merge pull request #12813 from pratu16x7/hub-fixes
Hub listing and entity page
2018-02-08 10:47:16 +05:30
Saurabh
1a4d77a962 Fixes #12810 for Offline POS 2018-02-08 01:32:48 +05:30
Saurabh
056c1709c6 Fixes #12810 2018-02-08 00:22:53 +05:30
Prateeksha Singh
4413ce1be1 company page, deprecate custom page 2018-02-07 23:50:01 +05:30
Bassam Ramadan
fd044a0d5e docs-fixes (#12805) 2018-02-07 18:59:06 +05:30
rohitwaghchaure
b553b7a69d PDC Enhancements (#12462) 2018-02-07 18:32:51 +05:30
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
Prateeksha Singh
3eaccffbd9 [hub] items searchable via core filters 2018-02-05 12:58:30 +05:30
Prateeksha Singh
b8e9c9be08 [hub] form (info) view for items 2018-02-05 12:58:30 +05:30
Faris Ansari
9b64620bc0 [hub] hub page using BaseList 2018-02-05 12:57:49 +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