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

4157 Commits

Author SHA1 Message Date
deepeshgarg007
720020319f fix(Codacy): removed unused variable 2019-01-09 21:56:45 +05:30
deepeshgarg007
c039f70496 Test Cases for 
account balance report
 2019-01-09 21:56:45 +05:30
deepeshgarg007
8621869d24 Created multiple reports and linked them to email digest 2019-01-09 21:56:45 +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
Nabin Hait
4e3e784691
Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix 
perf: Customer contact column in accounts receivable report
 2019-01-08 11:52:20 +05:30
Deepesh Garg
7c45f45ebc fix: Divide by zero exception fix in item wise purchase register (#16247) 
* Do not prepare row if stock quantity is not available

* Update item_wise_purchase_register.py
 2019-01-08 08:34:28 +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
Sagar Vora
cad20abe83
Merge branch 'staging-fixes' into loyalty-program-fix 2019-01-07 15:32:40 +05:30
Sagar Vora
1310c238a9
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger 
fix: replaced str to cstr in genral ledger report
 2019-01-07 14:28:27 +05:30
Rohit Waghchaure
ed6725172d Replaced str to cstr in genral ledger report 2019-01-06 20:07:18 +05:30
Deepesh Garg
0eca1646e6
Merge branch 'staging-fixes' into loyalty-program-fix 2019-01-06 12:16:54 +05:30
Frappe Bot
fdd5d54d41 Merge branch 'staging' into develop 2019-01-05 09:11:15 +00:00
deepeshgarg007
eabf260706 fix :Test cases for accounts receivable report 2019-01-04 12:34:28 +05:30
deepeshgarg007
9de81cda77 Added Customer contact column in accounts Receivable 2019-01-04 10:54:24 +05:30
Charles-Henri Decultot
94e35e7a7e Fix #15917 (#16311) 2019-01-01 22:25:13 +05:30
deepeshgarg007
8300f5ede7 fix: Codacy issues and added test case 2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix 2019-01-01 19:46:08 +05:30
Nabin Hait
137a24f457
Merge pull request #16253 from chdecultot/sales_summary_correction 
[Fix] Filter cancelled and draft payments in sales payment summary
 2018-12-31 12:02:19 +05:30
Charles-Henri Decultot
e87eb07e16 Correction for Travis 2018-12-27 17:38:57 +00:00
Charles-Henri Decultot
8d71015bf8 Cleanup journal entries 2018-12-27 16:43:26 +00:00
Charles-Henri Decultot
b7339d7dcb Test travis 2018-12-27 15:30:56 +00:00
Charles-Henri Decultot
43c7bd57e4 Cancel existing payment entries for data integrity in test 2018-12-27 14:43:30 +00:00
Charles-Henri Decultot
641d3e0073 Add own records 2018-12-27 13:43:56 +00:00
Charles-Henri Decultot
0f9c47c242 Remove pricing rule from items 2018-12-27 10:10:18 +00:00
Charles-Henri Decultot
02aa9fb240 Understand Travis 2018-12-27 08:46:29 +00:00
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Charles-Henri Decultot
d7777696d7 Corrections for Travis 2018-12-26 14:08:00 +00:00
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Charles-Henri Decultot
9c1db688d1 Ignore pricing rule for Travis 2018-12-26 10:33:42 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes 
Fix user permission checks
 2018-12-26 14:49:01 +05:30
Charles-Henri Decultot
899b9b1ea7 Codacy correction 2018-12-26 08:56:11 +00:00
Charles-Henri Decultot
9d31452c25 Remove ununsed variable 2018-12-26 08:38:42 +00:00
Charles-Henri Decultot
ed94317df9 Test cases 2018-12-26 08:36:32 +00:00
deepeshgarg007
a1d015cc2f Initialized loyalty_point_details 2018-12-26 11:01:02 +05:30
deepeshgarg007
12f5cefc12 Loyalty program issue fix in customer dashboard 2018-12-25 16:06:19 +05:30
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
Rushabh Mehta
5d11abb0a2 fix(escaping): accounts_receivable.py 2018-12-24 16:03:24 +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
772e8780b4
Merge branch 'staging-fixes' into permission-fixes 2018-12-24 10:35:12 +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
Charles-Henri Decultot
813485023b Filter cancelled and draft payments 2018-12-20 14:04:00 +00:00
Nabin Hait
0866b2b75a
Update accounts_receivable.py 2018-12-20 14:11:20 +05:30
Suraj Shetty
7ed37ae6c3 Commonify code 
- use get_permitted_documents function to avoid code redundancy
 2018-12-19 19:56:42 +05:30
deepeshgarg007
b645c2c75e Rebase using staging-fixes and resolved conflicts 2018-12-19 18:47:36 +05:30
deepeshgarg007
530453e4fc Added temp variables for outstanding, credit_note_amt instead of function calling 2018-12-19 18:43:07 +05:30
deepeshgarg007
5de603c6af breaked up code into multiple functions 2018-12-19 18:43:06 +05:30