Prateeksha Singh
|
08a6de6b41
|
fix(modules): shorten descriptions
|
2019-02-12 07:41:52 +05:30 |
|
Saif Ur Rehman
|
1a441b267d
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-02-01 19:17:04 +05:00 |
|
Sagar Vora
|
56cbfe4bb0
|
Merge branch 'master' into develop
|
2019-01-31 13:34:32 +05:30 |
|
Sagar Vora
|
76728b87ab
|
fix: value missing for selling settings - sales_update_frequency (#16530)
|
2019-01-31 08:19:38 +05:30 |
|
Saurabh
|
a342138625
|
Merge branch 'master' into develop
|
2019-01-30 12:38:58 +05:30 |
|
rohitwaghchaure
|
25e63e806c
|
fix: modified date (#16520)
|
2019-01-30 11:46:34 +05:30 |
|
Sagar Vora
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +05:30 |
|
Nabin Hait
|
1467962f8a
|
Merge pull request #16490 from nabinhait/gst_settings_perm
GST Settings permission and regional taxes creation
|
2019-01-29 11:27:18 +05:30 |
|
Nabin Hait
|
3ccc16e4e0
|
Merge pull request #16449 from scmmishra/remove-foundation
feat: Deprecated In App Help
|
2019-01-29 11:20:23 +05:30 |
|
Nabin Hait
|
e8190473f5
|
Merge branch 'staging-fixes' into unicode
|
2019-01-29 11:13:04 +05:30 |
|
scmmishra
|
3f9b231f31
|
[fix] Links now redirect to erpnext.com
|
2019-01-25 12:56:27 +05:30 |
|
Nabin Hait
|
f05d91d317
|
Merge branch 'develop' into Item-Tax-Template-V12
|
2019-01-25 11:26:47 +05:30 |
|
Nabin Hait
|
596c1b3489
|
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary
feat: Party Ledger Summary Report
|
2019-01-25 11:22:55 +05:30 |
|
Nabin Hait
|
ddc65dfb87
|
fix: delete taxes and charges template while deleting company
|
2019-01-25 11:04:14 +05:30 |
|
Nabin Hait
|
2a1aedfff1
|
fix(setup): Create regional taxes on creation on company
|
2019-01-24 17:56:19 +05:30 |
|
Faris Ansari
|
badf1c42e0
|
chore: Add error logging for failed get_exchange_rate call
|
2019-01-24 16:28:53 +05:30 |
|
deepeshgarg007
|
0c38cf06a5
|
fix: Wrong argument fix in email digest filters
|
2019-01-23 19:11:24 +05:30 |
|
Aditya Hase
|
f3c22f342c
|
fix(unicode): Import unicode_literals in every file
|
2019-01-22 18:36:10 +05:30 |
|
Saif Ur Rehman
|
74a3370095
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
|
2019-01-22 16:20:40 +05:00 |
|
Sagar Vora
|
4d1a9b10ed
|
Merge branch 'staging' into develop
|
2019-01-22 15:56:39 +05:30 |
|
Nabin Hait
|
f0ea152022
|
Merge pull request #16289 from Anurag810/Quality-inspection-fix
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
|
2019-01-22 10:49:55 +05:30 |
|
Nabin Hait
|
a39f324682
|
fix: Disable rounded total field's value honours docfield's default value
|
2019-01-21 18:50:50 +05:30 |
|
deepeshgarg007
|
3565395e7a
|
Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest
|
2019-01-21 15:03:51 +05:30 |
|
deepeshgarg007
|
aab6d0e028
|
fix(email_digest): Linkes annual income and annual expense to profit and loss statement
|
2019-01-21 15:01:40 +05:30 |
|
Deepesh Garg
|
f7fe08c487
|
Merge branch 'develop' into email_digest
|
2019-01-20 16:53:41 +05:30 |
|
Saif Ur Rehman
|
fcaed12a53
|
Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary
|
2019-01-19 13:18:23 +05:00 |
|
Saif Ur Rehman
|
398f593e5f
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-01-18 17:33:19 +05:00 |
|
deepeshgarg007
|
3c9dd73f91
|
Added company filters for reports
|
2019-01-18 11:29:37 +05:30 |
|
Nabin Hait
|
bef2c22d23
|
Fix: merge conflict
|
2019-01-18 10:15:47 +05:30 |
|
deepeshgarg007
|
00f989a916
|
fix(email_digest): fix in account heads
|
2019-01-17 17:59:52 +05:30 |
|
deepeshgarg007
|
753c5d7514
|
fix(Codacy): Possible Sql injections
|
2019-01-17 12:28:56 +05:30 |
|
deepeshgarg007
|
f8bbcc56b7
|
refactor(email_digest): Fixes in email digest links and reports
|
2019-01-16 22:22:48 +05:30 |
|
Nabin Hait
|
983d102a19
|
Merge branch 'staging-fixes' into Quality-inspection-fix
|
2019-01-16 17:52:30 +05:30 |
|
Nabin Hait
|
29552c1ec4
|
Merge pull request #16304 from netchampfaris/fix-item-group-pagination
fix(website): Pagination in child item groups
|
2019-01-16 10:31:48 +05:30 |
|
Saif Ur Rehman
|
f86123ad5a
|
feat(Party Ledger Summary): Include columns for discount and other adjustments
|
2019-01-15 15:18:43 +05:00 |
|
Saurabh
|
68ea608ca8
|
fix: import unicode_literals
|
2019-01-15 14:47:32 +05:30 |
|
Nabin Hait
|
187bdf08a6
|
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
|
2019-01-10 10:55:41 +05:30 |
|
Saif Ur Rehman
|
8d61794540
|
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
|
2019-01-10 04:23:40 +05:00 |
|
deepeshgarg007
|
8621869d24
|
Created multiple reports and linked them to email digest
|
2019-01-09 21:56:45 +05:30 |
|
deepeshgarg007
|
2b47d39274
|
feat: Links for reports in email digest
|
2019-01-09 21:54:40 +05:30 |
|
Saif Ur Rehman
|
091cfba5fc
|
test: Added test for get_item_tax_template and get_item_tax_map
|
2019-01-09 11:24:30 +05:00 |
|
Saurabh
|
afec3ca89a
|
Merge branch 'staging' into develop
|
2019-01-08 17:09:36 +05:30 |
|
Saif Ur Rehman
|
380b4b0926
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
|
2019-01-08 13:41:46 +05:00 |
|
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 |
|
Saif Ur Rehman
|
e194a655df
|
fix: is_opening != 'Yes'
|
2019-01-02 16:09:34 +05:00 |
|
Anurag Mishra
|
0c8411d085
|
test cases sucess
|
2018-12-28 16:53:00 +05:30 |
|
Faris Ansari
|
af75d9a384
|
fix(website): Pagination in child item groups
Item groups pages which had child item groups were not paged at all
despite having next, prev buttons
|
2018-12-28 14:47:51 +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 |
|
Suraj Shetty
|
b2965001d1
|
Replace 'Make' with 'Create'
|
2018-12-23 13:25:58 +05:30 |
|
Saif Ur Rehman
|
8ac261750b
|
Add and Modified DocTypes for Item Tax Template
|
2018-12-22 02:51:59 +05:00 |
|