Nabin Hait
|
caab582943
|
Tax breakup for actual amount and fixes in itemised purchase register (#10515)
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
|
2017-08-24 16:22:28 +05:30 |
|
Rushabh Mehta
|
6b651d734e
|
[fix] status in purchase_receipt.py (#10534)
|
2017-08-24 15:47:49 +05:30 |
|
Rushabh Mehta
|
7e506af0b9
|
[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 (#10538)
|
2017-08-24 15:23:33 +05:30 |
|
mbauskar
|
2d2b12c800
|
Merge branch 'hotfix'
|
2017-08-23 13:06:43 +05:30 |
|
mbauskar
|
918f029d98
|
bumped to version 8.9.1
|
2017-08-23 13:36:43 +06:00 |
|
Nabin Hait
|
cb40bd86f8
|
Supplier bill no in GST itemised purchase register (#10513)
|
2017-08-23 13:04:50 +05:30 |
|
Saurabh
|
b903c86076
|
Merge pull request #10506 from nabinhait/hotfix677
Minor fix in itemised sales register
|
2017-08-23 11:13:31 +05:30 |
|
Nabin Hait
|
fcb2462902
|
Minor fix in itemised sales register
|
2017-08-23 09:44:33 +05:30 |
|
mbauskar
|
1669404f06
|
Merge branch 'staging'
|
2017-08-22 20:22:24 +05:30 |
|
mbauskar
|
d46a9572af
|
bumped to version 8.9.0
|
2017-08-22 20:52:24 +06:00 |
|
mbauskar
|
081ff80882
|
Merge branch 'hotfix'
|
2017-08-22 15:42:10 +05:30 |
|
mbauskar
|
4396a0e9a8
|
Merge branch 'master' into staging
|
2017-08-22 15:42:10 +05:30 |
|
mbauskar
|
974cfd2895
|
bumped to version 8.8.6
|
2017-08-22 16:12:09 +06:00 |
|
rohitwaghchaure
|
187cea3602
|
[Fix] Accepting duplicate serial no is purchase receipt (#10469)
* [Fix] Accepting duplicate serial no is purchase receipt
* Fixed test cases
|
2017-08-22 15:38:32 +05:30 |
|
Nabin Hait
|
28d8557905
|
[fix] Taxes in itemised purchase register (#10494)
|
2017-08-22 15:30:45 +05:30 |
|
mbauskar
|
8f4e1712ba
|
Merge branch 'hotfix'
|
2017-08-22 12:03:47 +05:30 |
|
mbauskar
|
7716a08b5d
|
Merge branch 'master' into staging
|
2017-08-22 12:03:47 +05:30 |
|
mbauskar
|
4cbd43cb40
|
bumped to version 8.8.5
|
2017-08-22 12:33:46 +06:00 |
|
Makarand Bauskar
|
11224eaf06
|
[hotfix] fixes for TypeError: 'NoneType' object is not iterable (#10484)
|
2017-08-22 12:03:02 +05:30 |
|
rohitwaghchaure
|
02bad86037
|
Merge pull request #10473 from rohitwaghchaure/item_group_issue_in_pos
[Fix] Pricing rule applying only on item groups defined in POS profile
|
2017-08-22 11:34:49 +05:30 |
|
Makarand Bauskar
|
a591d1df5f
|
[minor] ingore user permission for old_parent fields (#10471)
|
2017-08-21 19:04:49 +05:30 |
|
Rohit Waghchaure
|
33326fe90e
|
[Fix] Pricing rule applying only on item groups defined in POS profile
|
2017-08-21 16:30:21 +05:30 |
|
mbauskar
|
5088ad11ee
|
Merge branch 'master' into staging
|
2017-08-21 08:58:52 +05:30 |
|
mbauskar
|
9d6900bd3b
|
Merge branch 'hotfix'
|
2017-08-21 08:57:32 +05:30 |
|
mbauskar
|
ddb26d02e5
|
bumped to version 8.8.4
|
2017-08-21 09:27:32 +06:00 |
|
Nabin Hait
|
879e162cce
|
Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405)
|
2017-08-21 08:28:55 +05:30 |
|
Nabin Hait
|
1f49f511aa
|
Tax rate in Itemised sales/purchase register and cleanups (#10439)
|
2017-08-21 08:05:12 +05:30 |
|
rohitwaghchaure
|
0d9ab86496
|
[Fix] Making of production order from so, system not fetched the items from the sales order item if packing list has items and vice versa (#10453)
|
2017-08-21 07:52:49 +05:30 |
|
rohitwaghchaure
|
6b1624cfee
|
[Fix] Tax rule is not working for the parent customer groups (#10458)
|
2017-08-21 07:38:37 +05:30 |
|
Makarand Bauskar
|
222e86bb13
|
[hotfix] fixed the mysql syntax error issue on stock ledger report (#10442)
|
2017-08-21 07:35:16 +05:30 |
|
Makarand Bauskar
|
80d06da978
|
[hotfix] fixed mysql syntax error in Student and Guardian Contact Details report (#10450)
|
2017-08-21 07:34:45 +05:30 |
|
Makarand Bauskar
|
fe43ecb5ee
|
[hotfix] fixed type in gst_state_code_data.json file (#10437)
|
2017-08-17 17:34:25 +05:30 |
|
rohitwaghchaure
|
fff56530c4
|
[Fix] Due date not fetching on the payment entry against the invoices (#10419)
|
2017-08-17 14:47:25 +05:30 |
|
Makarand Bauskar
|
446c2b0e91
|
[hotfix] fixes for https://github.com/frappe/erpnext/issues/9782 calculate leave without pay before subtracting holidays (#10355)
|
2017-08-17 12:39:35 +05:30 |
|
Nabin Hait
|
64c32dcd59
|
[fix] Update monthly sales value on Company (#10417)
* [fix] Update monthly sales value on cancellation of invoice, also update modified datestamp
* Company monthly sales: patches and test cases
|
2017-08-16 15:04:18 +05:30 |
|
tundebabzy
|
f35710db15
|
remove empty first row if needed (#10378)
refactor code: move global functions to callback scope
|
2017-08-16 13:25:18 +05:30 |
|
tundebabzy
|
258faab761
|
Transaction Forms (Payment Entry, Sales Invoice, Purchase Invoice) can forget company currency (#10409) (#10410)
* properly keep track of document currency and company currency
* Update taxes_and_totals.js
|
2017-08-16 13:16:46 +05:30 |
|
mbauskar
|
40377e87de
|
Merge branch 'master' into staging
|
2017-08-14 12:33:56 +05:30 |
|
mbauskar
|
7b7a77a551
|
Merge branch 'hotfix'
|
2017-08-14 12:33:55 +05:30 |
|
mbauskar
|
e0cc7c64a1
|
bumped to version 8.8.3
|
2017-08-14 13:03:55 +06:00 |
|
Makarand Bauskar
|
e5ae4d3bd3
|
send email via the background jobs (#10374) (#10393)
* send the email via the background worker in the payment request (#10350)
* send email via the background jobs (#10374)
|
2017-08-14 12:22:50 +05:30 |
|
mbauskar
|
f03afe0878
|
Merge branch 'master' into staging
|
2017-08-14 09:31:01 +05:30 |
|
mbauskar
|
41d77e8d86
|
Merge branch 'hotfix'
|
2017-08-14 09:31:00 +05:30 |
|
mbauskar
|
b2f160eef0
|
bumped to version 8.8.2
|
2017-08-14 10:01:00 +06:00 |
|
tundebabzy
|
041b9c3c32
|
make item name read only and add hide if not saved (#10382)
|
2017-08-14 09:16:07 +05:30 |
|
rohitwaghchaure
|
2e8232e7aa
|
[Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company (#10320)
|
2017-08-10 11:32:59 +05:30 |
|
Makarand Bauskar
|
aac8349391
|
[hotfix] remove the white spaces from condition and formula fields (#10331)
* [hotfix] remove the white spaces from condition and formula fields
* [tests] added tests cases for whitespaces in formula and condition fields
|
2017-08-10 11:25:49 +05:30 |
|
rohitwaghchaure
|
35438b6fc0
|
[Fix] Opportunity status has not changed after making of quotation against it if items has not added in the opportunity (#10351)
|
2017-08-10 11:15:50 +05:30 |
|
mbauskar
|
08c3f4758e
|
Merge branch 'develop' into staging
|
2017-08-10 10:58:17 +05:30 |
|
mbauskar
|
5039d6de6f
|
Merge branch 'develop' into staging
|
2017-08-10 10:56:33 +05:30 |
|