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

3021 Commits

Author SHA1 Message Date
Frappe Bot
e415cce1a9 Merge branch 'staging' into develop 2019-01-23 08:19:00 +00:00
Nabin Hait
36706c04bb
Merge pull request #16451 from nabinhait/unicode-issue 
fix: Unicode issue in purchase invoice
 2019-01-23 12:11:00 +05:30
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports 
fix: Multiple fixes in the reports
 2019-01-23 12:05:36 +05:30
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Nabin Hait
a5270e561f fix: Unicode issue in purchase invoice 2019-01-22 15:43:04 +05:30
Rohit Waghchaure
ddd9136d10 Renamed field and added finance book column in the trial balance simple report 2019-01-22 14:11:57 +05:30
Rohit Waghchaure
de718dacb2 fix: Code cleanup 2019-01-21 19:47:17 +05:30
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series 
feat(naming): Deferred naming for SLE and GL Entry
 2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Rohit Waghchaure
fa7ee0b3b6 Added dafult bank account in the customer/supplier 2019-01-17 15:45:27 +05:30
Rohit Waghchaure
f725816809 Enhance: Added field limit in the Payment Reconciliation to handle large entries 2019-01-17 12:54:14 +05:30
Saurabh
7d630b3e29 Merge branch 'master' into staging-fixes 2019-01-15 19:41:09 +05:30
Rohit Waghchaure
b2d08a498b Added bank account field in the payment entry 2019-01-15 16:11:29 +05:30
Nabin Hait
4ed7cfc515 tests(cost-center-company): Validate cost center's company and revent tests 2019-01-14 17:14:39 +05:30
rohitwaghchaure
ba54209c86 [Fix] Exchange rate revaluation, get entries not working if accounts of the other currency than company currency not available (#16379) 2019-01-12 17:58:00 +05:30
Nabin Hait
e6ec6cccfa
Merge pull request #16316 from Anurag810/purchase-invoice-fixes 
fix: expense head of asset items in purchase invoice
 2019-01-08 20:23:14 +05:30
Saurabh
afec3ca89a Merge branch 'staging' into develop 2019-01-08 17:09:36 +05:30
Nabin Hait
c190192d5f
Merge pull request #16277 from deepeshgarg007/loyalty-program-fix 
fix: Loyalty program issue fix in customer dashboard
 2019-01-08 12:15:57 +05:30
Aditya Hase
85c6a0f002 fix(test): Do not rely on order by name 2019-01-08 00:09:37 +05:30
Aditya Hase
7bc692d48d feat(naming): Deferred naming for Stock Ledger Entry and GL Entry 
For fast lockless insertions use hash as autonaming method for
temporarily naming Stock Ledger Entry and GL Entry

In an hourly run scheduled job rename these entries using autoname options
 2019-01-08 00:07:54 +05:30
Saif
e5091cbc0f chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356) 
* chore: Updated DocType json files to clean up git diff of other PRs

* fix: remove auto-generated file
 2019-01-07 18:19:30 +05:30
Anurag Mishra
5865fcca3c fix: expense head of asset items in purchase invoice 2019-01-02 14:36:07 +05:30
deepeshgarg007
8300f5ede7 fix: Codacy issues and added test case 2019-01-01 20:28:49 +05:30
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
rohitwaghchaure
136c4c4820
Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue 
[Fix] Tax Withholding, TDS is applying on the tax
 2018-12-25 14:49:05 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Rohit Waghchaure
94500a9d62 [Fix] TDS is applying on the tax 2018-12-24 15:13:52 +05:30
Charles-Henri Decultot
052033a76e [Fix] Pos bugs (#16256) 
* Remove hard-coded values

* Fix change pos profile + add campaign

* Test case for coveralls

* Remove unnecessary method
 2018-12-24 14:39:30 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
deepeshgarg007
4ac8fcf4af Added test case for Accounts receivable report based on payment terms 2018-12-19 18:43:06 +05:30
Faris Ansari
4994d84565 fix(pos-profile): Cleanup Form for POS Profile (#16208) 
- Remove pos_profile_name field and use `name` as Prompt
- Reorganize form and label sections
- Remove `apply_discount` which was not used
 2018-12-14 14:19:14 +05:30
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
RicardoJohann
bc0ef0beca Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080) 2018-12-10 17:43:03 +05:30
Deepesh Garg
0c3c148316 Linking company address to pos profile (#16142) 
* Linking company address to pos profile

* Translation fix
 2018-12-10 16:22:38 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f Merge branch 'master' into staging-fixes 2018-12-06 09:26:42 +00:00
Nabin Hait
dd7b020b01 fix(test): Fixed tests for period closing voucher 2018-12-03 14:24:41 +05:30
Nabin Hait
eda0a6eb33 fix(test): Fixed tests for period closing voucher 2018-11-30 15:15:17 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Nabin Hait
96598936ad fix(test): Fixed tests for discount with margin and period closing voucher 2018-11-27 17:48:13 +05:30
Nabin Hait
73ca3cfca6 fix(test): removed test print 2018-11-26 16:16:42 +05:30
Nabin Hait
2665c37f38 temp(travis): Print statement to fix travis 2018-11-26 11:05:28 +05:30
Nabin Hait
2508d11097 fix(test): Test cases fixed 2018-11-26 11:05:28 +05:30
Frappe Bot
eb4969d24f Merge branch 'staging' into develop 2018-11-15 09:26:03 +00:00
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Nabin Hait
688758a56f fix(test): Fixed item discount amount calculation and test cases related to pricing rule 2018-11-13 16:13:16 +05:30
Saif
60ec88bcc8 Added Default Warehouse field that sets all item's warehouse (#15462) 
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied

* Set def_warehouse in test_sales_order.py

* Changed from def_warehouse to set_warehouse

* Rest of def_warehouse to set_warehouse
 2018-11-13 12:37:53 +05:30
Britlog
9e9e37d39b [Fix] Conversion factor in offline POS (#15867) 2018-11-13 11:34:27 +05:30