deepeshgarg007
|
1f9a6febdd
|
fix: Assign given price list if POS price list is not available
|
2019-01-25 11:53:55 +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
|
50e552321b
|
Merge pull request #16363 from scmmishra/leave-application-naming
fix: Naming series not reflecting in leave application
|
2019-01-25 10:34:01 +05:30 |
|
Nabin Hait
|
cce96758fc
|
Merge pull request #16484 from netchampfaris/add-logging-for-failed-exchange-rate
chore: Add error logging for failed get_exchange_rate call
|
2019-01-25 10:33:03 +05:30 |
|
Nabin Hait
|
42462fac9d
|
Merge pull request #16465 from nabinhait/eway_bill
fix(accounts): Validate gst accounts defined in GST Settings in eway bill report
|
2019-01-25 10:00:06 +05:30 |
|
Nabin Hait
|
f1ff5c24ff
|
Merge pull request #16469 from sagarvora/minor-gstin
fix(regional): remove duplicate validation for GSTIN
|
2019-01-25 09:59:45 +05:30 |
|
Nabin Hait
|
05f1c0e1b9
|
Merge pull request #16470 from netchampfaris/fix-jinja-unicode-formatting
fix: Don't use .format in jinja templates
|
2019-01-25 09:57:37 +05:30 |
|
Nabin Hait
|
e21bdf020c
|
Merge pull request #16472 from deepeshgarg007/cost_center
fix(cost_center): Bug fix in update_cost_center_number argument name
|
2019-01-25 09:56:52 +05:30 |
|
Nabin Hait
|
76d93e7220
|
Merge pull request #16474 from deepeshgarg007/email_digest_fix
fix: Wrong argument fix in email digest filters
|
2019-01-25 09:55:47 +05:30 |
|
Nabin Hait
|
a6ab38665d
|
Merge pull request #16487 from netchampfaris/fix-gst-pos-invoice
fix: Dont show 0 amount taxes and tax breakup
|
2019-01-25 09:54:07 +05:30 |
|
Nabin Hait
|
393080ecbe
|
Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working
fix: ascii codec while opening offline POS
|
2019-01-25 09:50:41 +05:30 |
|
Nabin Hait
|
f6459335da
|
Merge pull request #16493 from rohitwaghchaure/bank_reconcilliation_entry_issue
fix: bank reconcilliation showing multiple entries against one JV
|
2019-01-25 09:50:07 +05:30 |
|
Nabin Hait
|
fc9e733d7f
|
Merge pull request #16483 from surajshetty3416/stock-levels-based-on-permission
fix: Show stock levels in Item master based on user permissions
|
2019-01-25 09:48:43 +05:30 |
|
Suraj Shetty
|
1c9dd67f15
|
Merge branch 'staging-fixes' into add-logging-for-failed-exchange-rate
|
2019-01-25 09:22:46 +05:30 |
|
Rohit Waghchaure
|
e14cc8f2b6
|
fix: bank reconcilliation showing multiple entries against one JV
|
2019-01-25 00:23:41 +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 |
|
Rohit Waghchaure
|
74df01d3d1
|
fix: ascii code while opening offline POS
|
2019-01-25 00:03:35 +05:30 |
|
rohitwaghchaure
|
7e4cf62a15
|
Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative
Show outward entries in negative for Bank Clearance Summary report
|
2019-01-24 22:13:40 +05:30 |
|
Aditya Hase
|
a40c43e414
|
fix(ar-summary): Changes to column list to match recent changes
|
2019-01-24 19:13:32 +05:30 |
|
Nabin Hait
|
2a1aedfff1
|
fix(setup): Create regional taxes on creation on company
|
2019-01-24 17:56:19 +05:30 |
|
Nabin Hait
|
49b41e49ae
|
fix: Added permissions in GST Settings and added filters for accounts based on company
|
2019-01-24 17:55:44 +05:30 |
|
deepeshgarg007
|
c48efaba6e
|
fix(sales_invoice): fetch customer price list if available before pos profile price list
|
2019-01-24 17:15:38 +05:30 |
|
Faris Ansari
|
d6f837c5e5
|
fix: Dont show 0 amount taxes and tax breakup
|
2019-01-24 17:10:33 +05:30 |
|
Faris Ansari
|
badf1c42e0
|
chore: Add error logging for failed get_exchange_rate call
|
2019-01-24 16:28:53 +05:30 |
|
Suraj Shetty
|
7a45887fa1
|
fix typo
|
2019-01-24 16:26:48 +05:30 |
|
Suraj Shetty
|
dd0496f7aa
|
Add missed out field field
|
2019-01-24 16:18:43 +05:30 |
|
Suraj Shetty
|
c165838228
|
Filter bin list based on warehouses that are accessible to the user
|
2019-01-24 15:45:46 +05:30 |
|
pipeCh
|
c16c7fffb4
|
fixed for "Select Serial Numbers" dialog won't fill mandatory field
|
2019-01-24 15:00:07 +07:00 |
|
Suraj Shetty
|
41b3756df5
|
fix: patch to replace Project icon with Projects icon (#16374)
* Delete duplicate projects icon from desktop.py
* Fix patch (to replace project to projects)
|
2019-01-24 10:57:05 +05:30 |
|
deepeshgarg007
|
0c38cf06a5
|
fix: Wrong argument fix in email digest filters
|
2019-01-23 19:11:24 +05:30 |
|
deepeshgarg007
|
19ab86a3a7
|
fix:(cost_center): fix for update cost center number
|
2019-01-23 17:28:13 +05:30 |
|
Sagar Vora
|
e9778d9556
|
fix: do not use built-in "input", reload_doc
|
2019-01-23 17:13:31 +05:30 |
|
Sagar Vora
|
f51661b225
|
fix: allow operators, make weighting_function mandatory
|
2019-01-23 16:42:28 +05:30 |
|
Faris Ansari
|
853d3fd1ab
|
fix: Don't use .format in jinja templates
- Jinja doesn't allow unicode strings to be formatted in templates
|
2019-01-23 16:34:22 +05:30 |
|
Sagar Vora
|
9aeabce3d3
|
fix: trailing whitespace, duplication & more
|
2019-01-23 16:01:19 +05:30 |
|
Sagar Vora
|
d75095b04c
|
fix(regional): remove duplicate validation for GSTIN
|
2019-01-23 14:40:01 +05:30 |
|
Sagar Vora
|
57d7c837aa
|
fix: supplier scorecard test
|
2019-01-23 14:26:35 +05:30 |
|
Sagar Vora
|
fb256d68ff
|
Merge branch 'fix-supplier-scorecard' of /home/snv/Work/master_bench/apps/erpnext into fix-scorecard
|
2019-01-23 14:13:40 +05:30 |
|
Sagar Vora
|
037d0f8ba6
|
fix(buying): make supplier scorecard usable
|
2019-01-23 14:11:25 +05:30 |
|
Frappe Bot
|
e415cce1a9
|
Merge branch 'staging' into develop
|
2019-01-23 08:19:00 +00:00 |
|
Frappe Bot
|
f74e28bc64
|
Merge branch 'staging-fixes' into staging
|
2019-01-23 08:12:19 +00:00 |
|
Frappe Bot
|
2d5bf69dc4
|
bumped to version 11.0.3-beta.37
|
2019-01-23 08:12:19 +00:00 |
|
Frappe Bot
|
34121bc81a
|
Merge branch 'master' into staging-fixes
|
2019-01-23 08:08:55 +00:00 |
|
Frappe Bot
|
d801437f5f
|
Merge branch 'hotfix'
|
2019-01-23 08:08:53 +00:00 |
|
Frappe Bot
|
342854f6f2
|
bumped to version 10.1.80
|
2019-01-23 08:08:53 +00:00 |
|
Nabin Hait
|
06607fda4e
|
fix: removed print statement
|
2019-01-23 12:15:48 +05:30 |
|