Saurabh
2ac1835f7d
[fix] if is_root is true make parent account empty ( #12255 )
2018-01-01 16:17:43 +05:30
Saurabh
a6b41e855b
[fix] check if null for mode of payments ( #12264 )
2018-01-01 16:16:50 +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
rohitwaghchaure
dbb5ae9a9e
[fix] Closing balance showing at wrong side ( #12220 )
2017-12-28 13:15:21 +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
ed13b3c19a
Fixed minor issue
2017-12-25 15:11:56 +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
Prateeksha Singh
b61d091f4c
[setup] remove sample data commit, fix namespace
2017-12-25 12:30:35 +05:30
rohitwaghchaure
75789b65c2
[Fix] Sales payment summary report ( #12151 )
2017-12-25 11:26:15 +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
Vishal Dhayagude
7c57b6ecd8
[fix] Column Heading in received item to be billed report ( #12083 )
2017-12-19 11:23:34 +05:30
rohitwaghchaure
e3b5c0f727
[fix] Regional print format showing for other countries users ( #12045 )
2017-12-16 10:53:53 +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
2a9dc9019a
Fixed closing debit/credit in general ledger report
2017-12-15 19:41:20 +05:30
Nabin Hait
2afcff1852
Get outstanding invoices on payment entry
2017-12-15 17:32:03 +05:30
Nabin Hait
6a640b78c4
Minor fixes in payroll entry and opening invoice tool
2017-12-15 15:34:14 +05:30
Nabin Hait
9771b9376d
Merge branch 'master' into develop
2017-12-15 12:53:56 +05:30
tundebabzy
1d459c4327
Make Journal entry from Invoice based on Payment Terms (due date) #11989 ( #12019 )
...
* don"t summarise due_dates query
* reference_due_date to fetch outstanding based on due date
* use if else so that no need to do useless checks
* clear debit and credit fields before fetching outstanding
* grid keeps forgetting drop down so add to options
* clear debit and credit fields before fetching outstanding properly
2017-12-15 11:29:27 +05:30
Pawan Mehta
d6cb617520
Fix 11948 - Sales Payment Summary ( #11950 )
...
* [fix] #11948
* [fix] #11948
* [fix] #11948
* codacy issues
2017-12-14 18:04:31 +05:30
Nabin Hait
d0249b0880
Employee advance ( #11875 )
...
* Employee Advances against Expense Claim
* added employee advance test cases and docs
* Default Employee Advance Account field in company
* Cleanup and fixes of employee advance
2017-12-14 13:25:57 +05:30
Shreya Shah
a2cfd97cd7
fetch party name ( #11985 )
2017-12-14 12:42:01 +05:30
rohitwaghchaure
5759258dcf
[fix] Added total closing in general ledger ( #11961 )
2017-12-13 18:57:37 +05:30
Charles-Henri Decultot
d18423d9c7
Project Margin Calculation Improvement ( #11911 )
...
* Project Margin Calculation Improvement
* Documentation modification
* Change Total Planned Sales to Total Sales Amount
* Change documentation screenshot
2017-12-12 14:59:59 +05:30
rohitwaghchaure
4e17fae63b
[enhance] UAE/KSA VAT/Excise implementation ( #11923 )
2017-12-12 14:40:52 +05:30
Shreya Shah
ea723e59c6
POS Profile validation message rephrased ( #11934 )
...
* pos validation message improvised
* removed unused field
2017-12-12 14:24:00 +05:30
tundebabzy
f628184c68
Error in Opening Invoice creation Tool ( #11938 ) ( #11941 )
...
* add qty field
* cast qty to float
* PEP8 compliance
2017-12-12 14:19:07 +05:30
pawan
1892454036
Add Total Row
2017-12-11 17:48:56 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Vishal Dhayagude
6d250f8789
[fix] Missing value Net Weight Added in Calculate Based On select field ( #11883 )
2017-12-08 11:35:18 +05:30
Nabin Hait
5de499e5d5
Minor cleanups
2017-12-07 12:01:06 +05:30
pawan
271b7cd4f9
codacy issues
2017-12-07 12:01:00 +05:30
pawan
19f09b0b69
fix codacy issues
2017-12-07 12:00:06 +05:30
pawan
d8e91982ca
Fixed Merge conflict
2017-12-07 12:00:01 +05:30
Nabin Hait
97b8a7b237
Minor fixes in payroll entry
2017-12-06 19:55:57 +05:30
Nabin Hait
c84476bd27
Fixed merge conflict
2017-12-06 14:17:51 +05:30
Manas Solanki
a160879159
set the reference document in the payment entry while creating from fees ( #11861 )
...
* set the reference document in the payment entry while creating from fees
* allocate the paid amount in the reference document
2017-12-06 14:05:39 +05:30
tundebabzy
6a418f2a9b
change Purchase Taxes and Charges default to 'Total' ( #11857 )
2017-12-06 13:15:33 +05:30
rohitwaghchaure
d52c64ff11
[fix] Show total for opening and closing dr/cr ( #11860 )
2017-12-06 13:14:28 +05:30
rohitwaghchaure
3a5ca927e7
[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category ( #11848 )
...
* [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category
* Update asset_depreciations_and_balances.py
2017-12-04 19:29:03 +05:30
Nabin Hait
a11dcb6e59
Pull items in Stock Entry from Purchase Invoice ( #11839 )
2017-12-04 13:36:50 +05:30
tundebabzy
1fb285c165
hide html example in print ( #11830 )
2017-12-04 11:13:36 +05:30
Shreya Shah
11938a47ec
fixed typo ( #11825 )
2017-12-01 17:38:26 +05:30
