Nabin Hait
2ef1f84041
Fixed merge conflict
2018-02-03 09:14:53 +05:30
Jay Parikh
d4359faa31
Enable/Disable Discount in POS using POS Profile #11748
2018-02-01 04:26:24 -08:00
Nabin Hait
ec2c9ec897
Merge branch 'master' into develop
2018-01-31 15:39:16 +05:30
Nabin Hait
7918b92d95
Invalid date value comparison, fixes for mariadb 10.2.3+
2018-01-31 15:30:03 +05:30
Nabin Hait
585254456e
Check credit limit while making DN, if bypassed on SO ( #12702 )
2018-01-30 12:11:22 +05:30
rohitwaghchaure
ce5b93ca77
[Fix] Allow user to edit rate in online POS ( #12701 )
2018-01-30 10:39:46 +05:30
Saurabh
59c915f599
Merge branch 'master' into develop
2018-01-29 18:53:54 +05:30
Shreya Shah
406d449e12
fix posting date in journal entry on load ( #12694 )
2018-01-29 18:01:20 +05:30
Saurabh
d581ff40ea
Merge branch 'master' into develop
2018-01-29 17:42:37 +05:30
rohitwaghchaure
86c7ede321
Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue
...
[Fix] Subscription send notification issue
2018-01-29 17:01:00 +05:30
Rohit Waghchaure
7e033aae11
[Fix] Subscription send notification issue
2018-01-29 16:53:37 +05:30
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
Saurabh
fb2f97391f
resolved merge conflicts
2018-01-24 11:24:10 +05:30
Saurabh
6cc10104f0
[fix] enable rename for payment terms and payment term template
2018-01-24 11:15:02 +05:30
Saurabh
3a609108ae
Codacy changes
2018-01-23 17:23:26 +05:30
Saurabh
32695a938f
[Mod] Refactored the code for fetching allow_print_before_pay check value
2018-01-23 17:23:26 +05:30
Saurabh
3959aeb848
[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice
2018-01-23 15:40:43 +05:30
britlog
ddd2bc9aac
Translate payment request subject
2018-01-22 23:23:31 +01:00
Nabin Hait
570e29d5e7
Fixed merge conflict
2018-01-17 18:56:02 +05:30
Nabin Hait
91fd29a963
Remove enqueuing update_total_sales method, sometimes it does not include current invoice ( #12522 )
2018-01-17 16:14:31 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale ( #12514 )
...
* GL Entry on asset sale
* Asset sale test case fixed
2018-01-17 14:39:05 +05:30
Saurabh
35d8ce4fbd
resolved merge conflicts
2018-01-12 16:58:32 +05:30
tundebabzy
df023bff7f
add posting_date/transaction_date to list_view ( #12453 )
2018-01-12 16:27:29 +05:30
rohitwaghchaure
9fbed5617f
[Fix] Wrong batch showing in the popup ( #12421 )
2018-01-12 16:22:33 +05:30
Nabin Hait
619c42b934
GSTR1 for B2B ( #12296 )
2018-01-10 17:48:03 +05:30
Saurabh
892a7a6980
resolved merge conflicts
2018-01-09 12:05:20 +05:30
Zarrar
0f458b1260
show balance if permitted to view gl entry ( #12385 )
2018-01-09 11:27:14 +05:30
tundebabzy
da22167741
Purchase Invoice - Due Date reverts to first time value on save #12340 ( #12382 )
...
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.
* ui test cases
* cleanup
2018-01-09 10:58:44 +05:30
rohitwaghchaure
bf4c114c58
[Enhance] Provision to show inclusive tax in print ( #12345 )
...
* [Enhance] Provision to show inclusive tax in print
* POS Print format
2018-01-08 15:20:15 +05:30
Zlash65
745c2658eb
delete root node allow
2018-01-08 11:53:52 +05:30
Nabin Hait
07e5376043
Fixes and cleanups of reserve qty for subcontracting
2018-01-05 18:19:59 +05:30
rohitwaghchaure
bc2c83ee3c
Companywise default tax template ( #12290 )
...
* Companywise default tax template
* Fix test cases
2018-01-05 12:42:02 +05:30
Nabin Hait
42688f0636
Minor fix
2018-01-04 18:12:21 +05:30
Nabin Hait
76625b359e
Removed naming series from set_only_once in pos profile
2018-01-03 14:03:53 +05:30
Nabin Hait
96b264b314
Minor fixes
2018-01-02 11:50:29 +05:30
rohitwaghchaure
2640c7eec5
[Fix] Validation issue for online POS profile ( #12276 )
2018-01-01 16:15:41 +05:30
rohitwaghchaure
fe22686a8f
Update last purchase rate from the purchase invoice ( #12189 )
2017-12-28 16:11:27 +05:30
Nabin Hait
123759aff7
Fixes for travis ( #12161 )
...
* Fixes for travis
* Testcase fixes for get_item_details
* Testcase fixes for get_item_details
* Travis fixes
* Travis fixes
2017-12-26 17:50:34 +05:30
Nabin Hait
92615901a7
Fixed merge conflict
2017-12-25 13:41:04 +05:30
Nabin Hait
e9dabd5cec
Settings to show payment schedule in print ( #12158 )
2017-12-25 13:30:01 +05:30
rohitwaghchaure
443691aaf8
[Fix] Allow to change exchange rate in the payment entry if allow stale is enabled ( #12128 )
2017-12-22 10:59:01 +05:30
tunde
e3104938ff
fix typo
2017-12-21 16:25:44 +01:00
Nabin Hait
a5cc84f8af
Reverted gl entry splitting based on payment terms ( #12117 )
...
* Reverted gl entry splitting based on payment terms
* changed modified date
2017-12-21 11:37:18 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms ( #12115 )
2017-12-20 12:24:59 +05:30
Manas Solanki
8413f76c19
set the mandatory field in the backend ( #12102 )
2017-12-20 12:03:19 +05:30
tundebabzy
dbd068c44b
Sales Order With Payment Terms Not Split In Payment Entry #12051 ( #12065 )
...
* validate schedule dates in non-invoice documents
* change query for orders
* take care of orders with/without payment schedule
* clean up, refactor, PEP8
2017-12-19 14:36:39 +05:30
tundebabzy
90076bc3b5
Make Journal entry from Invoice based on Payment Terms (due date) #11989 ( #12047 )
...
* split journal entry according to invoice due date
* fix bug where reference_due_dates options are not populated:
- after making JE, add options to _onload
- use __onload to add options
* cater for case where no payment_schedule
2017-12-19 11:58:31 +05:30
rohitwaghchaure
938a1fee80
[minor] Tax id of supplier not fetching in purchase invoice ( #12052 )
2017-12-16 10:51:07 +05:30
Nabin Hait
2afcff1852
Get outstanding invoices on payment entry
2017-12-15 17:32:03 +05:30
