Nabin Hait
|
53659cf0bd
|
Update payment_entry_reference.json
|
2017-10-16 12:57:51 +05:30 |
|
Makarand Bauskar
|
80f333950b
|
[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' (#11195)
|
2017-10-16 11:27:22 +05:30 |
|
mbauskar
|
cd4202c2f7
|
Merge branch 'master' into develop
|
2017-10-15 19:10:56 +05:30 |
|
rohitwaghchaure
|
496174bbdf
|
[Fix] Naming series not copy from referebce document to new document in subscription (#11196)
|
2017-10-15 19:08:42 +05:30 |
|
Saurabh
|
5ffed60916
|
Merge branch 'master' into develop
|
2017-10-11 14:39:11 +05:30 |
|
Makarand Bauskar
|
4cdb9dee09
|
[minor] changed the modified date for the subscription doctype (#11142)
|
2017-10-10 18:41:00 +05:30 |
|
tunde
|
37c2b6116c
|
Merge branch 'develop' into payment-terms
|
2017-10-09 15:42:47 +01:00 |
|
mbauskar
|
966b3c156a
|
[conflicts] resolved merge conflicts
|
2017-10-09 15:20:30 +05:30 |
|
Rohit Waghchaure
|
beeba8b37a
|
[Fix] Discount field not displaying in offline POS
|
2017-10-06 09:50:43 +05:30 |
|
Rohit Waghchaure
|
b870d0081b
|
[fix] Online print format in pos profile field not displaying
|
2017-10-06 09:31:40 +05:30 |
|
tunde
|
d82677f1e6
|
Merge branch 'develop' into payment-terms
|
2017-10-06 02:23:45 +01:00 |
|
Utkarsh Goswami
|
4cb4d2f155
|
Tests for payment entry against purchase invoice (#10930)
|
2017-10-05 16:51:42 +05:30 |
|
mbauskar
|
74ce391303
|
Merge branch 'master' into develop
|
2017-10-05 13:36:50 +05:30 |
|
Nabin Hait
|
729aa2025a
|
Show commission section for pos as well (#11059)
|
2017-10-05 12:21:36 +05:30 |
|
rohitwaghchaure
|
e87a076f1d
|
Update link in the pos for offline and online mode from pos settings (#11061)
|
2017-10-05 12:20:20 +05:30 |
|
Nabin Hait
|
3d0d4b2157
|
update subscription period only if relevant date field exists (#11046)
|
2017-10-04 15:51:55 +05:30 |
|
Nabin Hait
|
b779644493
|
Merge branch 'master' into develop
|
2017-10-04 14:52:32 +05:30 |
|
Makarand Bauskar
|
eaec4695f7
|
[hotfix] filter doctype if the doctype has subscription field (#11038)
|
2017-10-04 14:34:45 +05:30 |
|
Saurabh
|
ee4a2dd26f
|
[fix] resolved merge conflicts
|
2017-10-03 18:02:09 +05:30 |
|
Rohit Waghchaure
|
445e8a2e57
|
[Fix] Subscription end date, cancel issue, added from and to date
|
2017-10-03 17:45:11 +05:30 |
|
tunde
|
19e63b73ed
|
Merge branch 'develop' into payment-terms
|
2017-10-03 12:02:38 +01:00 |
|
Nabin Hait
|
7eba1a35d3
|
Controller init args fix (#11015)
* Controller init args fix
* cleanup useless code
|
2017-10-02 15:59:27 +05:30 |
|
Nabin Hait
|
8919669ac2
|
Merge branch 'master' into develop
|
2017-10-02 12:28:27 +05:30 |
|
rohitwaghchaure
|
88491715e0
|
[Fix] select batch not displaying in the modal, duplicate invoice making after sync (#11005)
|
2017-10-02 12:13:36 +05:30 |
|
tunde
|
c49e748c85
|
Merge branch 'develop' into payment-terms
|
2017-09-29 13:30:22 +01:00 |
|
Rushabh Mehta
|
912ae24ca2
|
Merge branch 'master' into develop
|
2017-09-29 16:22:02 +05:30 |
|
Faris Ansari
|
8ac56b26e0
|
[Enhancement] Allow Multiple users in POS Profile
|
2017-09-29 16:15:15 +05:30 |
|
Pawan Mehta
|
5d8fd477bd
|
[fix] #10840 (#10844)
|
2017-09-29 15:23:54 +05:30 |
|
tunde
|
25275077ab
|
Merge branch 'develop' into payment-terms
|
2017-09-29 10:47:01 +01:00 |
|
Makarand Bauskar
|
9c339145b2
|
[Enhance] Custom notification messages for subscription documents (#10970)
* [minor] configurable subscription email message and subject for notification
* [minor] added description for subject field
|
2017-09-29 15:02:51 +05:30 |
|
tunde
|
3415ac6e9c
|
Merge branch 'develop' into payment-terms
|
2017-09-29 10:10:24 +01:00 |
|
Rushabh Mehta
|
3c14c5a16c
|
[fix] tax_rule.py args
|
2017-09-29 13:21:22 +05:30 |
|
Nabin Hait
|
c314485d55
|
Fixes based on test case
|
2017-09-28 18:55:49 +05:30 |
|
Nabin Hait
|
fce14fdcf0
|
Fixed merge conflict
|
2017-09-27 17:21:21 +05:30 |
|
Rohit Waghchaure
|
566a0a05c8
|
[fix] 'NoneType' object is not iterable while saving quotation
|
2017-09-27 15:57:48 +05:30 |
|
Nabin Hait
|
76e1ca35ad
|
Merge branch 'master' into develop
|
2017-09-27 13:05:21 +05:30 |
|
Makarand Bauskar
|
70eaf2da95
|
[minor] removed the default precision for the margin_rate_or_amount field (#10923)
|
2017-09-27 12:49:16 +05:30 |
|
tunde
|
567119170e
|
Merge branch 'develop' into payment-terms
|
2017-09-26 17:28:07 +01:00 |
|
Nabin Hait
|
51a07d19c8
|
Merge branch 'master' into develop
|
2017-09-26 15:59:15 +05:30 |
|
Nabin Hait
|
b0ba55e52f
|
Set bill no while making payment entry from purchase invoice
|
2017-09-26 15:56:58 +05:30 |
|
tunde
|
095cfc9cfc
|
disable some Payment Schedule fields
|
2017-09-26 10:25:49 +01:00 |
|
tunde
|
9e4dcdfbc8
|
rename Payment Terms Schedule section break to Payment Terms
|
2017-09-26 09:44:23 +01:00 |
|
tunde
|
192587fe56
|
UI test cases
|
2017-09-26 01:32:08 +01:00 |
|
tunde
|
c4b0d17c08
|
fix bug: can't make PE for invoice with multi due date
|
2017-09-26 01:02:43 +01:00 |
|
tunde
|
31ddbe36c0
|
fix bug: cast to flt
|
2017-09-25 23:24:32 +01:00 |
|
tunde
|
94c3c13ba6
|
fix failing tests
|
2017-09-25 14:47:48 +01:00 |
|
Nabin Hait
|
3b61552836
|
Revert "Advance against expense claim (#10632)" (#10877)
This reverts commit cdd6ded790cb31a44acb70c219cde0d30da09bde.
|
2017-09-25 11:27:39 +05:30 |
|
tunde
|
77ecacc379
|
validation to check for possible duplicate payment terms
|
2017-09-22 23:12:55 +01:00 |
|
tunde
|
cf42d1db5c
|
more tests
|
2017-09-22 17:20:33 +01:00 |
|
tunde
|
3aec78b472
|
make due date, invoice_portion mandatory
|
2017-09-22 16:22:15 +01:00 |
|