Rushabh Mehta
|
20db65ef77
|
Merge pull request #16694 from rmehta/refactor-comments
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
|
2019-02-18 12:05:35 +05:30 |
|
Rushabh Mehta
|
39c106dd05
|
fix(test): rename test in test_customer
|
2019-02-18 11:16:59 +05:30 |
|
Frappe Bot
|
74fd5daeb2
|
Merge branch 'master' into develop
|
2019-02-15 10:22:33 +00:00 |
|
deepeshgarg007
|
34f4f24e21
|
fix: Address and contact report
|
2019-02-14 17:26:49 +05:30 |
|
Deepesh Garg
|
4d1bc0ca85
|
fix: Add total row in analytics report (#16648)
|
2019-02-13 16:58:46 +05:30 |
|
Rushabh Mehta
|
c8018bdeb1
|
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
|
2019-02-09 21:10:29 +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
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +05:30 |
|
Deepesh Garg
|
a8cc4b105d
|
Merge branch 'staging-fixes' into pos_issue
|
2019-01-29 11:29:41 +05:30 |
|
Nabin Hait
|
e8190473f5
|
Merge branch 'staging-fixes' into unicode
|
2019-01-29 11:13:04 +05:30 |
|
deepeshgarg007
|
0bee62b460
|
fix: Made period fields read only and added validation for multiple entries by same user
|
2019-01-28 12:45:11 +05:30 |
|
deepeshgarg007
|
c2ffcc5e71
|
feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher
|
2019-01-27 16:09:07 +05:30 |
|
deepeshgarg007
|
49cca7ac76
|
fix: Customer based price_list in online POS
|
2019-01-25 16:41:01 +05:30 |
|
Saif Ur Rehman
|
37d7b80572
|
Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
# erpnext/selling/doctype/sales_order/sales_order.json
|
2019-01-24 23:41:35 +05:00 |
|
Saif Ur Rehman
|
3d275af67b
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
|
2019-01-24 23:40:16 +05:00 |
|
Saif Ur Rehman
|
d5c7410ad1
|
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
# erpnext/selling/doctype/sales_order/sales_order.json
|
2019-01-24 23:34:16 +05:00 |
|
Frappe Bot
|
e415cce1a9
|
Merge branch 'staging' into develop
|
2019-01-23 08:19:00 +00:00 |
|
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 |
|
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 |
|
Sagar Vora
|
ceacacc320
|
Merge branch 'master' into staging-fixes
|
2019-01-22 15:37:05 +05:30 |
|
Deepesh Garg
|
f7fe08c487
|
Merge branch 'develop' into email_digest
|
2019-01-20 16:53:41 +05:30 |
|
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 |
|
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 |
|
Deepesh Garg
|
bce62a4bcc
|
Delete __init__.py
|
2019-01-16 22:57:45 +05:30 |
|
Deepesh Garg
|
70657d06f4
|
Delete pending_sales_order.json
|
2019-01-16 22:57:20 +05:30 |
|
Deepesh Garg
|
b8e0bfc335
|
Delete pending_quotation.json
|
2019-01-16 22:56:30 +05:30 |
|
Deepesh Garg
|
9cf9cb0e00
|
Delete __init__.py
|
2019-01-16 22:55:48 +05:30 |
|
Deepesh Garg
|
9da018d59c
|
Delete quotation.json
|
2019-01-16 22:55:10 +05:30 |
|
Deepesh Garg
|
23b7f0def4
|
Delete __init__.py
|
2019-01-16 22:54:17 +05:30 |
|
Deepesh Garg
|
e95a4053cf
|
Delete sales_order.json
|
2019-01-16 22:53:53 +05:30 |
|
Deepesh Garg
|
e4303111b4
|
Delete __init__.py
|
2019-01-16 22:53:00 +05:30 |
|
Nabin Hait
|
4fd710a392
|
Merge branch 'staging-fixes' into company_address
|
2019-01-16 17:51:49 +05:30 |
|
Nabin Hait
|
3dde949419
|
feat(mr_against_so): Merge same items from different BOMs
|
2019-01-16 15:59:39 +05:30 |
|
Sahil Khan
|
34766c0c50
|
BIS issue fixes
|
2019-01-16 15:59:39 +05:30 |
|
Deepesh Garg
|
7bb7f95aa8
|
Merge branch 'staging-fixes' into company_address
|
2019-01-16 11:17:55 +05:30 |
|
Nabin Hait
|
f0571ddf4b
|
Merge pull request #16393 from diamorafaela/quotation-currency
fix: Quotation to Sales Order with different currency
|
2019-01-16 10:13:44 +05:30 |
|
Saurabh
|
7d630b3e29
|
Merge branch 'master' into staging-fixes
|
2019-01-15 19:41:09 +05:30 |
|
NahuelOperto
|
9080221d46
|
fix: added test cases
|
2019-01-14 12:12:56 -03:00 |
|
Saif Ur Rehman
|
502f15ba1b
|
test: test_party_details_tax_category
|
2019-01-12 19:07:39 +05:00 |
|
NahuelOperto
|
7facc34851
|
fix: removed filter from method validate
|
2019-01-11 10:46:38 -03:00 |
|
Nabin Hait
|
c693cd7f10
|
Merge pull request #16341 from Mangesh-Khairnar/date-range-fix
fix: Sales Analytics Period Range
|
2019-01-10 10:35:31 +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 |
|
Deepesh Garg
|
9c5e9d79f1
|
Merge branch 'staging-fixes' into company_address
|
2019-01-09 17:19:20 +05:30 |
|
deepeshgarg007
|
d29ee97307
|
Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt
|
2019-01-09 17:09:11 +05:30 |
|
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 |
|