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 |
|
Sagar Vora
|
fbadb19d93
|
Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice
|
2019-01-07 13:55:43 +05:30 |
|
Saif Ur Rehman
|
848bbac05e
|
Added patch for Item Tax Template
|
2019-01-07 05:32:38 +05:00 |
|
Saif Ur Rehman
|
f484f0d6e8
|
Added test for Tax Rule based on Tax Category
|
2019-01-07 00:37:01 +05:00 |
|
Rohit Waghchaure
|
ed6725172d
|
Replaced str to cstr in genral ledger report
|
2019-01-06 20:07:18 +05:30 |
|
Saif Ur Rehman
|
13a6c0aeff
|
Fix tests
|
2019-01-06 18:14:18 +05:00 |
|
Deepesh Garg
|
0eca1646e6
|
Merge branch 'staging-fixes' into loyalty-program-fix
|
2019-01-06 12:16:54 +05:30 |
|
Saif Ur Rehman
|
7ea6554f1f
|
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
|
2019-01-06 04:43:13 +05:00 |
|
Saif Ur Rehman
|
b1288b75ba
|
fix: Test Records
|
2019-01-06 04:41:13 +05:00 |
|
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 |
|
Rohit Waghchaure
|
1ff1fc4725
|
[Fix] Negative amount showing in the bank clearance summary
|
2019-01-02 17:56:08 +05:30 |
|
Saif Ur Rehman
|
016f29f09b
|
fix: error due to passing None in scrub
|
2019-01-02 16:22:22 +05:00 |
|
Saif Ur Rehman
|
e194a655df
|
fix: is_opening != 'Yes'
|
2019-01-02 16:09:34 +05:00 |
|
Anurag Mishra
|
5865fcca3c
|
fix: expense head of asset items in purchase invoice
|
2019-01-02 14:36:07 +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 |
|
Saif Ur Rehman
|
fac6b59627
|
Exclude opening invoices in Gross Profit Report
|
2019-01-01 16:33:22 +05:00 |
|
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 |
|
Saif Ur Rehman
|
f6a83daae6
|
fix: update item_tax_template account_type server-side validation
|
2018-12-29 02:27:03 +05:00 |
|
Saif Ur Rehman
|
eeead1d777
|
fix: Only load transaction's company's tax accounts in item tax map
|
2018-12-29 02:25:00 +05:00 |
|
Saif Ur Rehman
|
fd531a6b5e
|
feat: Tax Category based on Address
|
2018-12-29 01:49:11 +05:00 |
|
Saif Ur Rehman
|
aca374e478
|
feat: add_taxes_from_item_tax_template
|
2018-12-28 04:53:25 +05:00 |
|
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 |
|
Saif Ur Rehman
|
677866824a
|
More work on Tax Category and Item Tax Template
|
2018-12-27 02:11:07 +05:00 |
|
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 |
|