rohitwaghchaure
7477899d2e
Formatter, code cleanup ( #12852 )
2018-02-12 11:25:58 +05:30
rohitwaghchaure
7e75165826
Merge branch 'develop' into fixes_12829
2018-02-09 12:01:41 +05:30
pawan
83b1b802d1
print hide and pos.less changes
2018-02-08 19:56:12 +05:30
pawan
33571dc567
print hide changes
2018-02-08 19:35:48 +05:30
pawan
31d37f110a
print hide changes
2018-02-08 19:25:30 +05:30
Pawan Mehta
e2bc8bb644
Update sales_invoice.json
2018-02-08 16:35:03 +05:30
pawan
735b8c6094
[fix] #12829
2018-02-08 16:20:46 +05:30
Saurabh
ab8c7e616e
resolved merge conflicts
2018-02-08 15:17:15 +05:30
Saurabh
1a4d77a962
Fixes #12810 for Offline POS
2018-02-08 01:32:48 +05:30
rohitwaghchaure
b553b7a69d
PDC Enhancements ( #12462 )
2018-02-07 18:32:51 +05:30
Nabin Hait
c224d34a2c
Merge branch 'master' into develop
2018-02-07 16:07:20 +05:30
Nabin Hait
33f967d97c
Account name length fixed in HUngary and Germen COA
2018-02-07 16:00:42 +05:30
Nabin Hait
4b1bd15f7e
Draft status in pos print format
2018-02-07 12:40:45 +05:30
rohitwaghchaure
9a5037193f
Removed DR/CR from balance column ( #12791 )
...
* Removed DR/CR from balance column
* Update general_ledger.html
* Update general_ledger.py
2018-02-07 12:10:14 +05:30
Saurabh
50f7e29814
[New] Added Draft status in POS Invoice print formats if a Draft POS Invoice is printed
2018-02-06 00:23:21 +05:30
joezsweet
a8d5ef4891
space to tabs
2018-02-05 13:06:30 +01:00
rohitwaghchaure
a4c40e0fd6
[Fix] After accesing POS page, it does not work when going back from another page ( #12763 )
2018-02-05 12:24:06 +05:30
Nabin Hait
2ef1f84041
Fixed merge conflict
2018-02-03 09:14:53 +05:30
Helkyd
5e93b02c85
Update trial_balance.py
...
Assuming that Account_number has NUMBERs will sort.
2018-02-02 12:27:30 +00:00
rohitwaghchaure
cf6360d825
Merge pull request #12739 from jay-parikh/hotfix
...
Enable/Disable Discount in POS using POS Profile #11748
2018-02-02 13:12:38 +05:30
Helkyd
b258686b00
Update trial_balance.py
...
Fix to order only if account starts with Number ... while for others not required....
2018-02-01 15:53:30 +00:00
Nabin Hait
cae13bf048
Fixes in purchase register report ( #12737 )
2018-02-01 18:58:14 +05:30
Jay Parikh
d4359faa31
Enable/Disable Discount in POS using POS Profile #11748
2018-02-01 04:26:24 -08:00
rohitwaghchaure
441032d39c
Merge branch 'develop' into develop
2018-02-01 16:54:10 +05:30
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
Helkyd
d6a61ad0c3
Trial Balance sort by Account Name
...
Trial Balance order by Account Name
Used Sorted under Prepare_data Function.
2018-01-29 13:47:12 +00:00
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
Nabin Hait
1e1b2364ab
Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment ( #12689 )
2018-01-29 16:45:43 +05:30
Cesar
58c040cffb
Revert "Sort by account name"
...
This reverts commit 5cf01d9702
2018-01-29 11:57:15 +01:00
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Cesar
5cf01d9702
Sort by account name
...
Trial balance not sorted .. by adding those changes fixes the problem.
2018-01-29 11:54:12 +01:00
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
rohitwaghchaure
d36ac27f94
Update accounts_receivable.py
2018-01-29 12:35:19 +05:30
rohitwaghchaure
62b31bf708
Update accounts_receivable.py
2018-01-29 12:34:19 +05:30
Aditya Duggal
2136a7bded
Resolves Issue #12630 -Added Filters to AR
...
- Added Territory Filter to AR report
- Added Sales partner filter
- Added Sales person filter
-Terrtory filter is needed since if you need to see AR in North Inda you get with filter not with column
-Similarly there was a need for Sales Partner and sales person filter in the AR report which is being fulfilled now.
2018-01-24 18:16:08 +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
Saurabh
ef31637549
Merge branch 'master' into develop
2018-01-22 15:29:15 +05:30
Saurabh
e72915847c
Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column
...
Added currency in balance column in general ledger print
2018-01-22 16:35:37 +07:00
Rohit Waghchaure
bc94914338
[Fix] Sales payment summary issue
2018-01-20 17:01:31 +05:30
Rohit Waghchaure
edef642794
Added currency in balance column in general ledger print
2018-01-20 12:54:25 +05:30
Zlash65
93344dff26
group_by_account not displayed fix
2018-01-19 19:06:39 +05:30
Rohit Waghchaure
c987500e08
Merge branch 'master' into develop
2018-01-19 13:29:57 +05:30
Rohit Waghchaure
de420322b5
[Fix] Sales payment summary issue
2018-01-18 17:20:21 +05:30
rohitwaghchaure
bd47abdc9a
[Enhance] Running Balance in GL Report ( #12491 )
...
* Running Balance in GL Report
* Supplier invoice no in GL Report/Print Format
2018-01-18 09:32:43 +05:30
Nabin Hait
f1b098e03c
payment terms filter in AR Summary report ( #12529 )
2018-01-18 09:23:32 +05:30
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
rohitwaghchaure
60febc5465
[Fix] Gross profit validation issue ( #12516 )
2018-01-17 14:40:59 +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
4b0dd8a159
Merge branch 'master' into develop
2018-01-15 18:36:35 +05:30
Faris Ansari
f18cd2eaf7
[fix] is_root check
2018-01-15 18:30:01 +05:30
Saurabh
35d8ce4fbd
resolved merge conflicts
2018-01-12 16:58:32 +05:30
rohitwaghchaure
7b78f6bee6
Added rounded total in the POS and fix rounded issue in js side ( #12457 )
2018-01-12 16:28:16 +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
rohitwaghchaure
02302ff009
[Fix] Incoming rate for gross profit report ( #12422 )
2018-01-11 12:58:46 +05:30
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode
2018-01-10 21:49:27 +01:00
Nabin Hait
619c42b934
GSTR1 for B2B ( #12296 )
2018-01-10 17:48:03 +05:30
Nabin Hait
6b89644ca7
Payment terms filter in AR report
2018-01-09 15:39:35 +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
Pawan Mehta
5b069a4e25
Added Payment Details to Sales Payment Summary Report ( #12358 )
...
* [fix] #12357
* label changes
2018-01-09 10:53:13 +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
ci2014
5d3e486415
Fix english typo in source code
...
Fix english typo in source code
2018-01-06 04:04:06 +01:00
Nabin Hait
07e5376043
Fixes and cleanups of reserve qty for subcontracting
2018-01-05 18:19:59 +05:30
Saurabh
eac2e369cf
[fix] setup alias for ifnull condition ( #12327 )
2018-01-05 12:48:08 +05:30
rohitwaghchaure
bc2c83ee3c
Companywise default tax template ( #12290 )
...
* Companywise default tax template
* Fix test cases
2018-01-05 12:42:02 +05:30
rohitwaghchaure
c5c6f82623
[Hotfix] Tax rate not showing in the report ( #12324 )
2018-01-05 12:16:16 +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
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
Giovanni
2a098ada7c
- bug fix
2017-12-10 20:33:20 +01:00
Giovanni
2144e02d3c
- Added multiple barcode feature per item
2017-12-10 17:27:09 +01:00
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
Nabin Hait
7a294e6ef5
Update asset_category.json
2017-11-30 18:02:22 +05:30
Nabin Hait
5e801955f1
Update asset_category.json
2017-11-30 18:01:56 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Faris Ansari
ec3be9eebf
[hotfix] Party Type name ( #11797 )
2017-11-30 15:53:39 +05:30
Nabin Hait
e761b9de40
Rearranged fields due to merge conflict messup
2017-11-30 14:29:10 +05:30
Rohit Waghchaure
17e03cf3fc
[minor] Removed hidden for field pos profile
2017-11-29 17:40:42 +05:30
Vishal Dhayagude
855e390265
[fix] Sales Invoice json conflict ( #11779 )
2017-11-29 16:25:24 +05:30
Vishal Dhayagude
d42242df22
[Feature] Shipping Rule Calculation based on Net Weight ( #11770 )
...
* [new] Calculate shipping tax based on weight
* [fix] Change field name weight to weight_per_unit in SI Item
* [new] Shipping Rule based tax for selling module
* [new] Shipping rule based on weight added to Buying module
* [fix] Conflict in jsons
* [fix] Removed Redudant add_fetch
* [fix] Codacy fixed
* [fix] Print hide added
2017-11-29 16:09:59 +05:30
rohitwaghchaure
f591a220c9
Fetch items of item groups defined in the pos profile ( #11763 )
2017-11-29 13:55:13 +05:30
Nabin Hait
cf9573ab2f
Removed asset doctypes files from accounts module and patches
2017-11-28 16:56:53 +05:30
rohitwaghchaure
c037dc775e
Refactor multi pos profile selection in the pos invoice ( #11721 )
2017-11-28 16:11:15 +05:30
Kanchan Chauhan
e58a41a8a2
Added maintenance to Asset and enhanced maintenance for Asset Maintenance
2017-11-28 15:14:56 +05:30
Saurabh
b750b304dd
fixed merge-conflicts
2017-11-28 11:02:28 +05:30
