Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,055 Commits 3 Branches 0 Tags 1 GiB
ab50211e18
Commit Graph

4192 Commits

Author SHA1 Message Date
Yaqin Shurrab
cc56ff5c37 Get the correct Summation of Closing Balances (#14990) 
Fix total raw values for Closing Credit and Closing Debit
 2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3 [Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report (#14994) 2018-07-27 11:03:53 +05:30
Saurabh
f86224e6f7
Merge pull request #14945 from chdecultot/gocardless_corrections 
Gocardless improvement and  payment request correction
 2018-07-26 11:41:43 +05:30
Shreya Shah
cd717e422f Modify renaming process of Account (#14839) 
* Disable renaming for Account Master

* Update account name along with account number

* Fix as per suggestions

* Update account.js

* Fix typo

* Remove after_rename and before_rename methods

* Modify test case

* Modify field placement

* Remove unused method
 2018-07-23 14:15:20 +05:30
Saurabh
a638400e5d
Merge pull request #14707 from chdecultot/stripe_improvements_4 
Stripe Subscriptions
 2018-07-23 12:11:58 +05:30
Faris Ansari
5e096df5ae columnDef => column 2018-07-20 16:35:51 +05:30
Faris Ansari
e7f864a4dd Return early if filters not initialized 2018-07-20 16:31:01 +05:30
Faris Ansari
5986d59b01 Financial Reports 
- Update formatter for use with DataTable
- Fetch Currency from  filters and fallback to company currency
 2018-07-20 15:11:55 +05:30
Nabin Hait
47ce481394 Minor fix 2018-07-19 11:10:46 +05:30
Prateeksha Singh
627d0d58be
[fiscal-year] use to_date property 2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707 [fix] format fiscal year docname to proper date before using 🤦 (#14955) 2018-07-18 18:03:27 +05:30
Saurabh
0bfbf8aa6f [minor] remove conflicts 2018-07-18 17:21:07 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Faris Ansari
9e874af9ba Query report print (#14935) 
* QueryReport

- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns

* Query Report

- Replace frappe.query_report_filters_by_name with new API
 2018-07-18 09:28:44 +05:30
Charles-Henri Decultot
9d09343e57 Gocardless improvement and payment request correction 2018-07-17 16:15:30 +00:00
Rushabh Mehta
69fa808def [minor] fixes + patch (#14937) 2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832 Defaults in Item Group (#14874) 
* Add Defaults table in Item Group

* Fetch defaults from Item group if not found in Item

* Add patch

* Remove default fields from Item Group

* Set query for defaults

* Fix Codacy

* Modify test records

* Modify budget.py and sales_order.py

* Remove join from query

* Else condition to avoid error if no defaults found

* refrain from making item test records before item_group

* default cost center fetch correction

* Remove tab item group from query
 2018-07-17 18:01:44 +05:30
rohitwaghchaure
6863b03790 Naming series increase even if there is an exception while saving the invoice from the backend (#14938) 2018-07-17 17:20:15 +05:30
rohitwaghchaure
a76067eea1 [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899) 
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order

* Added test cases
 2018-07-17 16:50:50 +05:30
Saurabh
e78a877202 patch fixes (#14936) 2018-07-17 16:38:11 +05:30
Nabin Hait
26786bd35d minor route fix for general ledger 2018-07-17 15:59:15 +05:30
Zarrar
26c9b94cc6 [ Improv ] Loyalty Program more fixes and test case (#14888) 
* remove console statements

* set account & cost center for redemption

* add test case for single/multi tier & is_return scenario

* reset tier when changing loyalty program

* make loyalty fields non copy type

* fix test case - delete si after every test to avoid interference
 2018-07-16 18:11:53 +05:30
rohitwaghchaure
a3e070bc6b [Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914) 2018-07-16 18:11:19 +05:30
Charles-Henri Decultot
3fa3104dcc Debug cleanup 2018-07-13 14:00:42 +00:00
Charles-Henri Decultot
c047bf88db Rebase following Subscription corrections 2018-07-13 13:25:53 +00:00
Charles-Henri Decultot
7722b81c8e Variable correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a0b7236f66 Corrections following Saurabh's comments 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
90669a03b3 Test correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
da8b11fd12 Travis correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
8b3e841fbf Travis correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
cde1f08af6 Review corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
5a2ee41af3 Test correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
19a47c3e0a Codacy corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
244b638fe3 Dev cleanup 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a8d766f5f7 Remove payment plan reference 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
0134e13631 Subscription integration 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
f7ca908ea9 Corrections to Subscriptions 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
ba6f6d976d Stripe integration corrections 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6a40164dad Payment Request modifications 2018-07-13 13:05:54 +00:00
Saurabh
3d825e5689 Subscription test and fixes (#14875) 
* Add dashboard on subscriber screen

* Add Subscription and Subscription Plan to Account Dashboard

* Fetch customer name while creating subscriber

* [fix] add section for Subscription Period

* minor fixes

* optimization
 2018-07-13 17:41:36 +05:30
rohitwaghchaure
3ffe89659a [Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879) 2018-07-13 17:40:48 +05:30
Ameya Shenoy
a559b0de5a Role modifications for Shareholder (#14872) 
- Added roles: Accounts User, Accounts Manager, Sales Manager, Sales
User, Sales Master Manager to Shareholder, Share Type and Share
Transfer doctype
 2018-07-13 11:34:19 +05:30
Zarrar
5899d98077 [ Major ] Loyalty Program Fixes (#14863) 
* fix checking of customer_group & territory of customer in loyalty program

* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options

* removed disabled field, added from_date & to_date

* loyalty program section made collapsible, added redeem check in it

* setting loyalty program improvised, manual selection if multiple found

* get_query added, amount calculation updated

* args passed rectified for expiry_date

* get loyalty_points logic improv, redemption_details logic added

* improv based on from/to date and other rectification

* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
 2018-07-11 14:35:43 +05:30
Zarrar
9a3b785a03 [Minor] Employee Separation Fix (#14867) 
* delete associated task & project forcefully
in Employee Seapration cancel trigger

* remove leftover print statement

* remove console statements
 2018-07-11 14:34:55 +05:30
Shreya Shah
21d3352aa2
Merge pull request #14835 from shreyashah115/print-hide 
Print hide loyalty program related fields
 2018-07-06 18:36:47 +05:30
Shreya
9bcb959f81 Print hide loyalty program related fields 2018-07-06 18:17:02 +05:30
Zlash65
1aeca1d349 change name that fetches numbered value from acc & cc 2018-07-06 17:15:33 +05:30
Zarrar
17705f932d [ Minor ] Cost Center Number field added in field's dialog (#14781) 
* cost center number field when creating new
added field in the tree's dialog, necessary changes in the autoname function

* rename function's name appropriately
 2018-07-06 14:44:44 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
rohitwaghchaure
3f5e80ebe3 Allow bulk edit for the sales invoice item (#14826) 2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd Loyalty Program (#12631) 
* First Cut for the Loyalty Program

* finished the collection part

* redmeption for the loyalty point

	update the loyalty point entry in the FIFO style
	make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
	update the outstanding balance in the client side

* completed for the desk viewe

* wrap up for the desk and shopping cart

* pos

* fix and test the travis
 2018-07-06 12:36:57 +05:30
rohitwaghchaure
839320dca5 [Fix] Original Invoice outstanding is not updating after making Debit Note (#14821) 2018-07-06 10:42:15 +05:30
bobzz-zone
58236ffc1e Update budget_variance_report.py (#14798) 
Make sure GL Entry only called once in each row
 2018-07-06 10:39:00 +05:30
Zarrar
a3f6856d81 python 3 fix for sorted (#14814) 2018-07-05 10:37:39 +05:30
Rohit Waghchaure
5005e467a0 [Fix] POS Profile ignore pricing rule not working for online pos 2018-07-04 12:37:38 +05:30
Mohammed R Abukhamseen
8662a4f677 POS - Translate some text & numpad (#14765) 
* make label & placeholder translatable

* numpad translatable

* Update point_of_sale.js

remove debugger
 2018-07-01 16:44:09 +05:30
Nabin Hait
104f62090d Add filters for cost center in Budget Variance report 2018-06-29 12:25:03 +05:30
Himanshu Mishra
7aabef2026 Add configurable frequency in Selling Settings for update of project … (#14670) 
* Add configurable frequency in Selling Settings for update of project and company

* remove redundant code

* remove redundant code, only trigger calculation if order/invoice is present

* removed dangling commas as per common convention in hooks

* fix:handling multiple documents

* Update selling_settings.json
 2018-06-28 23:43:23 +05:30
rohitwaghchaure
191876f51b [Fix] Bank Account mandatory (#14734) 2018-06-28 23:28:58 +05:30
Charles-Henri Decultot
52fb43fc4f Add no copy to payment terms template (#14725) 2018-06-28 23:06:30 +05:30
Charles-Henri Decultot
8b22310d66 Allow auto repeat update (#14706) 
* Allow auto repeat update

* Allow auto-repeat reference update
 2018-06-28 14:27:58 +05:30
Zarrar
254ce645b1 [ Enhance ] Setup Wizard - Chart of Accounts (#14698) 
* enable selection of coa for user
Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart

* read chart from file and make a tree render-able dict of it

* tree method to return node data for coa setup wizard
 2018-06-28 14:15:34 +05:30
Shreya Shah
2fbc8509f5 Fix error message (#14716) 2018-06-28 14:14:28 +05:30
Manas Solanki
4933e6bfeb Update test_finance_book.py (#14703) 2018-06-27 17:30:09 +05:30
Manas Solanki
b912374b96 [test] check the finance book via the journal entry 2018-06-27 15:07:15 +05:30
rohitwaghchaure
67d87e29e3 [Fix] Wrong rate calculation in Itemwise sales register report for multi uom (#14690) 2018-06-27 11:22:03 +05:30
mnaim-cloude8
56e4346ead To fixed if if no schedule and disposal is NOT within the period. (#14637) 
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.

* Update asset_depreciations_and_balances.py
 2018-06-25 15:05:26 +05:30
rohitwaghchaure
34c187706d [Enhance] Added Budget exception approver role in company (#14645) 
* [Enhance] Added Budget exception approver role in company

* Added test cases for budget
 2018-06-25 10:31:08 +05:30
rohitwaghchaure
3a595d07d0 [Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649) 
* [Fix] POS Closing Voucher, on save collected amount becomes zero

* Added test cases for the POS Closing Voucher
 2018-06-25 10:10:29 +05:30
Sushant Nadkar
00f0f0f5fc Added adational filters to Tax Rule doctype (#14639) 2018-06-22 15:57:19 +05:30
Ameya Shenoy
4e96f55eff
Merge branch 'master' into develop 2018-06-22 05:10:29 +00:00
Zlash65
4cf46edabc expense_claim related fix in payment entry 
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
 2018-06-21 15:18:13 +05:30
rohitwaghchaure
79e5b07e62 [Fix] Subscription method (#14604) 
* [Fix] Subscription method path

* [Fix] Condition
 2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125 [Fix] Deferred account must be liability account (#14612) 2018-06-21 11:55:49 +05:30
Zarrar
e25dcd2737 [Minor] Report related fixes (#14620) 
* fix in query incase list is empty

* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated

* unset currency filter to apply default currency or so

* python 2 - 3 fix
 2018-06-21 10:53:12 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
rohitwaghchaure
fd5ac45775 [Fix] Not able to make invoice in the subscription (#14594) 2018-06-20 10:47:55 +05:30
Nabin Hait
a125a6199c Allowed paid amount against debit/credit note 2018-06-19 12:07:02 +05:30
Shreya Shah
97124e92fa [Fixes] Tax withholding category and Bank Guarantee (#14576) 
* Fetch withheld percentage

* Set query for accounts on the basis of company

* Fix bank guarantee error on submit

* Remove errors caused by fields which are removed
 2018-06-19 10:46:41 +05:30
Zarrar
80ff296e97 data not filled in acc. receivable report for some field fix (#14546) 2018-06-17 11:21:10 +05:30
rohitwaghchaure
83a2612a18 [Fix] Consolidated Financial Statement report (#14537) 2018-06-15 18:03:50 +05:30
rohitwaghchaure
77a45b43aa Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535) 2018-06-15 18:03:31 +05:30
Shreya Shah
27eff99190 [minor] Fixes for Exchange rate revaluation doctype (#14533) 
* Add set query for account and party_type

* Fix asset category error
 2018-06-15 16:30:15 +05:30
Shreya Shah
5f855d5da4 Add test case for Inter company Journal Entry (#14531) 2018-06-15 15:33:21 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
rohitwaghchaure
e647c1f3cb Renamed asset adjustment to asset value adjustment (#14532) 2018-06-15 13:06:28 +05:30
Shreya Shah
0b9b8d6826 Remove unused code (#14526) 2018-06-14 17:57:39 +05:30
Rushabh Mehta
1198d94904 [rename] Email Alert -> Notification 2018-06-14 13:18:21 +05:30
Zarrar
6ffdf94003 [Fixes] Defaults and User-Permission based fixes in treeview (#14501) 
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data

* make use of utility function for treeview
 2018-06-14 12:24:16 +05:30
IOWEB TECHNOLOGIES
62805e2101 Fix unicode literal issue that prevents payment entries to be created (#14515) 2018-06-14 09:14:07 +05:30
Shreya Shah
3d73a6f7f2 Fetch details from Journal Entry in Accounts Payable report (#14495) 
* Fetch bill_no, bill_date from Journal Entry

* Fix as per suggestion

* Fetch details only if bill_no exists
 2018-06-13 16:33:06 +05:30
Jamsheer
30f37b2eb1 Payroll Entry - Separate JE for flexi salary component (#14502) 
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry

* Journal Entry - validate cheque info on submit

* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
 2018-06-13 15:29:38 +05:30
Rohit Waghchaure
647d595158 Code cleanup and fixes for the asset 2018-06-11 19:15:08 +05:30
Manas Solanki
7e8cbf288c
Update cost_center.py 2018-06-11 14:25:27 +05:30
rohitwaghchaure
7048925016 [Enhance] Standalone debit/credit note (#14269) 
* [Enhance] Standalone debit/credit note

* Test cases

* Test cases and documentation

* Removed credit, debit note links from accounts module
 2018-06-11 12:02:14 +05:30
Zarrar
88a90ff3b5 minor fix in account and account utils (#14432) 2018-06-11 11:21:17 +05:30
Zarrar
44175904c6 Tree fix (#14425) 
* use frm.set_value instead of this.set_value

* generic methods moved to accounts/utils

* clean up code, and make use of methods added in utils
 2018-06-08 16:35:21 +05:30
Zarrar
7ab70ca2d7 [ Fixes ] v11 Tree based doctype testing (#14419) 
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node

* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash

* Company tree fix
Check if child exist while deleting a node validation added.

* Supplier Group tree fixes
on_trash validation added if child node present

* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
 2018-06-08 14:33:15 +05:30
Zarrar
8cd0f67b25 query fix if name contains apostrophe (#14370) 2018-06-07 16:48:31 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav 
Some more travis fixes
 2018-06-07 14:14:33 +05:30
Shreya
4638d1ab97 Fix POS Profile test 2018-06-06 16:23:16 +05:30
Charles-Henri Decultot
a774f3d7a0 POS closing voucher (#14270) 
* POS closing voucher

* Codacy corrections + improvements

* Codacy corrections

* POS Closing Voucher improvements
 2018-06-06 10:22:13 +05:30
Shreya
9c801b976d Fix share transfer test 2018-06-06 02:58:23 +05:30
Shreya Shah
630721aacc Travis (#14354) 
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
 2018-06-05 12:56:10 +05:30
Shreya Shah
4fa600a8dd Apply GST based on Origin and Place of supply GST Code (#14288) 
* Add new gst field in Taxes and Charges template - is_inter_state

* Add a patch

* Add a regional function to fetch taxes on the basis of GSTin

* Add regional function to hooks.py

* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN

* Fixes in the setup.py for India region

* Set is_inter_state field

For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.

* Fix as per review comment
 2018-06-05 11:27:53 +05:30
Saurabh
0eb622f7da [fix] resolve conflicts 2018-05-31 17:32:17 +05:30
Ahmad M Abdelrahman
f12b446dc8 Bank Account #13714 PR (#14295) 2018-05-31 08:58:23 +05:30
Saurabh
e5d076d495 [minor][fix] fix query syntax (#14294) 
* [minor][fix] fix query syntax

* Update pos.py
 2018-05-31 08:54:31 +05:30
Rohit Waghchaure
7c0dd7a142 Rearrange fields 2018-05-31 00:27:05 +05:30
Zarrar
58200182b4 update timeline data form Activity Log (#14276) 
Documents updated are stored in Activity Log rather than Communication
 2018-05-30 11:56:23 +05:30
Zarrar
b9f54ca946 [Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250) 
* add doctypes allowed to group items, average the rate

* add check field to group items during print

* call common before_print in delivery note

* fix precision issue while calculating average
 2018-05-28 17:41:09 +05:30
rohitwaghchaure
65684564c2
Merge pull request #14253 from rohitwaghchaure/financial_report_issue 
[Fix] Data not displaying in financial reports
 2018-05-28 15:03:43 +05:30
Rohit Waghchaure
c89a84b61e Fixed data not displaying in financial reports 2018-05-28 15:01:57 +05:30
Shreya Shah
13f39eb821 Display rate on the basis of stock UOM (#14246) 2018-05-28 11:50:28 +05:30
Shreya Shah
e329038aaa Total Quantity in Sales and Purchase DocTypes (#14114) 
* Add  field to all sales and purchase doctypes

* Add patch to update existing records

* Modify taxes_and_totals.py
 2018-05-28 11:49:08 +05:30
tundebabzy
3eb235a53b Sales Payment Summart Report Improvement (#14243) 
* fix iteritems() takes exactly 1 argument (2 given)

* adds new helper functions

* use new functions to make POS invoices filterable on warehouse and cost center

* more PEP8 fixes
 2018-05-28 10:26:45 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232) 
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
 2018-05-26 09:12:59 +05:30
Nabin Hait
33df0b4fbf
Test case fixes (#14219) 
* Test case fixes

* fetch_from fixes
 2018-05-26 09:09:02 +05:30
Nabin Hait
f87ec61043 Test case fixes for item defaults 2018-05-24 18:19:21 +05:30
Nabin Hait
b903fc4e71 Item defaults query fixes 2018-05-24 17:07:51 +05:30
neckos
7663bb91c5 return list(filter()) not filter() (#14191) 
filter constructs an iterator that is iterable only once
 2018-05-23 19:45:34 +05:30
Nabin Hait
5f861756a2 Item Default fixes 2018-05-23 19:37:06 +05:30
Rushabh Mehta
315dbd2ed1 [minor] chart_of_accounts.py for python3 2018-05-23 16:14:35 +05:30
Rushabh Mehta
8788688431 [fix] inconsistent indentation 2018-05-23 16:14:35 +05:30
Achilles Rasquinha
efb731941d ran 2to3, evaluation (#13499) 
* ran 2to3, evaluation

* Update update_gstin.py

* Update accounts_receivable_summary.py
 2018-05-23 11:31:24 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121) 
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
 2018-05-23 11:11:36 +05:30
Deepak kumar
e4c2ef03e1 Link Share Transfer to Account (#14127) 
* Link Share Transfer to Account

* minor changes

* minoor changes
 2018-05-23 10:50:22 +05:30
OSS Technolab
4fb4ca6b10 Project Budget does not filter per Project (#14179) 
* Project Budget does not filter per Project

Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project.

* Update budget.py
 2018-05-23 10:47:53 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop 2018-05-22 09:18:38 +00:00
Rohit Waghchaure
7529bbb7b4 [Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference' 2018-05-22 11:55:48 +05:30
rohitwaghchaure
742d3e5549 [Fix] General ledger default_currency issue for member party type (#14172) 2018-05-22 09:10:01 +05:30
rohitwaghchaure
734b874f3e
Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget 
[Fix] Patch, default cost center, expense account for the item
 2018-05-21 17:18:58 +05:30
Rohit Waghchaure
0ca7ba3247 [Fix] Patch, default cost center, expense account for the item 2018-05-21 16:43:50 +05:30
Valmik
bfb8a73377 Append company after (#14119) 2018-05-21 10:44:35 +05:30
Valmik
c28378f448 [fix] get barcode string instead of dict (#14139) 
* [fix] get barcode string instead of dict

* Update pos.py
 2018-05-21 10:06:05 +05:30
Rohit Waghchaure
f61e94e162 Changed condition of finance book in reports 2018-05-18 09:10:07 +05:30
Rohit Waghchaure
f689d01a0c Added finance book in Asset Depreciation Ledger report, fixed asset issue 2018-05-17 23:29:37 +05:30
Valmik Jangla
b52d5b21a1 Add UOM to Item View with Price 2018-05-17 00:09:21 -07:00
Rohit Waghchaure
585945e65d Allow to select Asset Received But Not Billed in expense account head 2018-05-17 00:23:27 +05:30
rohitwaghchaure
e8ef69ec33
Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty 
[Fix] Validation issue
 2018-05-16 23:58:09 +05:30
Rohit Waghchaure
2868840e6b [Fix] Validation issue 2018-05-16 23:57:28 +05:30
Rohit Waghchaure
44fda65b1d [Fix] Company mandatory issue 2018-05-16 23:31:09 +05:30
Rohit Waghchaure
a91765707a [Fix] TDS issue 2018-05-16 23:13:02 +05:30
rohitwaghchaure
64e81b436e
Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing 
[Fix] Custom buttons not showing
 2018-05-16 21:45:12 +05:30
Rohit Waghchaure
976af6b422 [Fix] Cystom buttons not showing 2018-05-16 21:43:16 +05:30
rohitwaghchaure
660ca9b6c0
Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue 
[Fix] Gl Enrty issue
 2018-05-16 21:34:44 +05:30
Rohit Waghchaure
1a328d02d2 [Fix] Gl Enrty issue 2018-05-16 21:34:06 +05:30
Rohit Waghchaure
8e4f676c8c [Fix] onload set default employee, leave approver, company 2018-05-16 19:55:52 +05:30
rohitwaghchaure
4ea97c84ac
Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual 
[Fix] Asset gl entry not creating for non perpetual
 2018-05-16 18:21:20 +05:30
Rohit Waghchaure
421697250b [Fix] Asset gl entry not creating for non perpetual 2018-05-16 18:20:52 +05:30
Shreya
63d14cfac8 Instead of throwing error, just return 2018-05-16 17:30:58 +05:30
Shreya
df9516e906 Add Finance Book to route options 2018-05-16 17:30:35 +05:30
Ameya Shenoy
6e92958578
spaces to tabs 2018-05-16 16:11:20 +05:30
rohitwaghchaure
9122f19e69
Merge pull request #14079 from saurabh6790/TDS_sprint 
[fix] calculate withholding only on invoice
 2018-05-16 15:01:46 +05:30
Saurabh
3c204122cd [fix] calculate withholding only on invoice 2018-05-16 15:00:19 +05:30
Charles-Henri Decultot
2f822476dd Removal of debugging print 2018-05-16 08:40:16 +00:00
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts 
[enhancement] add the item defaults in the child-table for multi-company
 2018-05-16 14:04:47 +05:30
Charles-Henri Decultot
dcfe19d868 Missing parentheses in price list rate determination 2018-05-16 08:34:41 +00:00
Suraj Shetty
fbb6b3da5f Undo replace of frappe.db.sql with frappe.get_list (#14074) 2018-05-16 13:53:31 +05:30
Ranjith Kurungadam
cdd4704485 Fixes, fields in Salary Component (#14071) 
* remove duplicate fields

* Salary Component - fields is_tax_applicable, is_payable

* fix intendation
 2018-05-16 13:10:08 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9 update for default warehouse 2018-05-16 12:44:07 +05:30
Rohit Waghchaure
144e9b178a Added project condition in budget validation 2018-05-16 12:15:57 +05:30
Rushabh Mehta
b56f3d0689 [fix] syntax errors 2018-05-16 12:03:39 +05:30
tundebabzy
ad08d4ce96 Ability to hold payment for disputed invoices #12048 (#13298) 
* add new fields to Supplier Master:
- on_hold: To signal the Customer is blocked from completing certain transactions
- hold_type: 3 options - All, invoices and payments

* sanitize `on_hold` field input

* show hold status in list view

* add `release_date` field to Supplier Master:
- specifies the date when transaction restraint will be removed

* reset release date if supplier is not on hold

* add validation to stop transactions when Supplier is blocked

* add test cases

* return empty list for outstanding references if supplier is blocked

* block make button:payment if supplier is blocked

* adjust test cases

* PEP 8 clean up

* more tests

* adds new fields to Purchase Invoice:
- release_date: once set, invoice will be on hold until set date
- hold_comment: so user can add comment pertaining to why invoice is on hold

* implement individual purchase invoice on hold logic

* allow user to change release date

* update manual

* final cleanup including more validation and tests

* update supplier manual

* make default for release_date argument todays date

* remove Auto Repeat added by mistake

* add on_hold_field to purchase invoice

* add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view

* implement explicit payment hold in purchase invoice

* update manual

* add dialog for saving comment

* bug fix, refactor, clean up

* more test cases
 2018-05-16 11:31:41 +05:30
Shreya Shah
1906cadd94 [Fix] Currency field in Pricing rule (#14004) 
* some minor changes

* Set query for price list based on currency

* Validate Price list with currency
 2018-05-16 11:20:30 +05:30
rohitwaghchaure
e8358f33a3 Refactor party type (#13831) 2018-05-16 11:02:26 +05:30
Suraj Shetty
8501010f12 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) 
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace
 2018-05-16 10:44:38 +05:30
rohitwaghchaure
f9fa588ddc
Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po 
[Enhance] Budget validation on material request, purchase order
 2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc [Enhance] Budget validation on material request, purchase order 2018-05-15 22:12:44 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate 
[Enhancement] Buying and Selling checkboxes in Currency Exchange
 2018-05-15 17:55:09 +05:30
Zlash65
36cb8fb153 removed hard coded account_type from tree's add_child entry 2018-05-15 17:36:01 +05:30
Shreya
3f77852e93 Pass buying or selling as filter parameters 
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
 2018-05-15 17:22:06 +05:30
Manas Solanki
1879f08c7c
Merge branch 'develop' into deferred-account 2018-05-15 15:20:44 +05:30
Manas Solanki
0b7f64924d booking via the schedular 2018-05-15 13:04:01 +05:30
Manas Solanki
0393848f60 deferred account in the item and company master 2018-05-15 13:04:01 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Saurabh
4ae089d6a1 Provision to deduct TDS on Advance 2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18 tds fixed for PI 2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec calculate TDS on Sales Invoice Amount 2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f Bootstrap 'TDS' via fixture 2018-05-14 20:41:38 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group 2018-05-14 20:39:01 +05:30
rohitwaghchaure
67da5f7671
Merge pull request #14023 from mntechnique/accounting_period 
Accounting Period
 2018-05-14 20:33:09 +05:30
Rohit Waghchaure
16bc853f6a Reschedule for future depreciations and booked difference amount in accumulated depreciation account 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a Commonify get_asset_category_account and get_fixed_asset_account method 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191 Added default asset accounts in COA, CWIP account in asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
af05995418 Asset accounting 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4 Added account fields in the company, fixes in auto creation of the asset from PR 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188 Asset linked to purchase receipt and serial no 2018-05-14 19:07:39 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number 
Cost center number
 2018-05-14 18:35:38 +05:30
rohitwaghchaure
044d6908cf
Merge pull request #13564 from sathishpy/develop 
Bank Statement Import
 2018-05-14 18:27:53 +05:30
Gaurav Naik
21b2df41ac [Fix] len() instead of .length 2018-05-14 18:15:47 +05:30
Gaurav Naik
caaebb9d2a [WIP] Accounting Period Test cases 2018-05-14 18:11:09 +05:30
Gaurav Naik
52571a80da Bootstrap documents for closing (js) 2018-05-14 18:06:50 +05:30
Gaurav Naik
2fe38c3ff5 Bootstrap documents for closing 2018-05-14 18:06:34 +05:30
Gaurav Naik
32b3aa257c [Fix] Indentation for accounting_period overlap 2018-05-14 18:02:24 +05:30
Zlash65
890707854d config/utility level changes 2018-05-14 11:45:38 +05:30
Zlash65
0a50554417 doctype level changes 2018-05-14 11:45:38 +05:30
Zlash65
4437a5ed18 json level changes 2018-05-14 11:45:38 +05:30
rohitwaghchaure
a8c49f26d3
Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue 
Fixed spelling
 2018-05-14 00:44:29 +05:30
Rohit Waghchaure
eee830eafe Fixed spelling 2018-05-13 16:17:18 +05:30
Gaurav Naik
9502476c67 Accounting Period overlap validation 2018-05-11 07:53:12 +05:30
Gaurav Naik
6c92cff226 Accounting Period autoname 2018-05-11 07:52:50 +05:30
Nabin Hait
b9fed2aa38 Removed company from Finance Book and related changes 2018-05-09 15:10:29 +05:30
Gaurav Naik
a78a0e241f Added finance book filtering logic to financial_statements.py 2018-05-09 15:03:40 +05:30
Gaurav Naik
40559d5f5c Added finance book filter logic to ReceivablePayable 2018-05-09 15:02:55 +05:30
Gaurav Naik
70ac2d2c51 Added finance book filter in accounts_receivable.js 2018-05-09 15:02:23 +05:30
Gaurav Naik
cddda8ac5f Added finance book filter in accounts_payable.js 2018-05-09 15:02:11 +05:30
Gaurav Naik
57856b475c Added finance book filter logic in general_ledger.py 2018-05-09 14:58:15 +05:30
Gaurav Naik
460d96f16d Added finance book filter to General Ledger 2018-05-09 14:57:36 +05:30
Gaurav Naik
a6d3cbfbc5 Added finance book field to GL Entry doctype 2018-05-09 14:56:52 +05:30
Gaurav Naik
30f9e0f547 Set finance book in make_gl_entries 2018-05-09 14:56:39 +05:30
Gaurav Naik
a948726ddd Added Finance Book doctype 2018-05-09 14:53:51 +05:30
Manas Solanki
fbe548e4be [Enterprise] Bank Guarantee Enhancements (#13960) 2018-05-09 14:49:53 +05:30
Nabin Hait
b2800eeb2a Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-05-08 16:34:35 +05:30
Nabin Hait
9036b9ee85 Merge branch 'master' into develop 2018-05-08 16:31:42 +05:30
Zarrar
f2df7f32fa update subscription to auto_repeat across dashboards (#13956) 2018-05-08 16:06:36 +05:30
Saurabh
b36517158b [fix] cheque print template coordinates (#13959) 2018-05-08 15:23:29 +05:30
Nabin Hait
330fae8652 minor fixes 2018-05-07 16:11:35 +05:30
Nabin Hait
fdc67a577f Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations 2018-05-07 13:12:16 +05:30
Rah Yuliantoro
b3882cacd9 update coa and company default (#13937) 
* Update standard_chart_of_accounts.py

adding account for employee advances

* Update standard_chart_of_accounts_with_account_number.py

adding account for employee advances

* Update company.py

adding accounts for default fields in company doctypes

* Update company.py

Missing some default accounts for fields in company doctype
 2018-05-07 11:39:35 +05:30
Nabin Hait
ba70ff0904
Exchange rate revaluation (#13932) 
* Added account data on child table

* Added Journal Entry button and functionality

* Add docs

* Refactoring and cleanup of Exchange Rate Revaluation
 2018-05-05 18:22:56 +05:30
Nabin Hait
338e1b6e91 Merge branch 'master' into develop 2018-05-05 14:33:35 +05:30
Nabin Hait
161f35a687
Update sales_invoice.py 2018-05-05 14:32:31 +05:30
Nabin Hait
4bbe5fbefc Fixes related to auto repeat 2018-05-05 12:32:59 +05:30
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Rohit Waghchaure
3e0a937cb8 [Fix] Tax not changes when user change the POS profile in the sales invoice 2018-05-04 19:20:20 +05:30
Suraj Shetty
dcc90e3312 Add fix to support changes in user permission (#13923) 
https://github.com/frappe/frappe/pull/5494
 2018-05-04 17:52:57 +05:30
Suraj Shetty
00cced12a0 Success Action (#13666) 
* success action config for  sales invoice

* remove "Notification Control" doctype and its usage

* add default success action after_install or while migration (patch)

* rename for_doctype to ref_doctype

* case change

* minor fix

* Remove unnecessary code

* Replace message with translatable message

* Fix 'cannot import error'
 2018-05-03 19:06:32 +05:30
Shreya Shah
ecb9315ea1 Inter Company Journal Entry (#13683) 
* rebase with enterprise_sprint

* Add Inter company account checkbox in Account master

* Add Inter Company Journal Entry Voucher Type in Journal Entry

* Make Inter Company Journal Entry button

* Dialog to select company for Inter Company Journal Entry

* Map relevant fields in the Inter Company Journal Entry and reference links

* Rebase

* Add Documentation
 2018-05-03 19:04:36 +05:30
Zarrar
6f3594b2e4 [Enhance] GL Entry - ability to multiselect party (#13769) 
* change dynamic link to multiselect field and improv

* print based fix

* refactor changes according to multiselect changes
 2018-05-03 19:00:43 +05:30
rohitwaghchaure
1aa3a11546 On auto-creation of new Fiscal Year, send Email notification to the account users (#13789) 2018-05-03 18:59:26 +05:30
Saurabh
e85a43c1c6 Merge branch 'master' into develop 2018-05-02 14:48:10 +05:30
Shreya
27e4e244b6 fix codacy 2018-05-02 14:34:14 +05:30
Shreya
ae0b31c31d changes as per the reviews 2018-05-02 14:34:14 +05:30
Shreya
b47302dd52 unlink reference on cancellation of any invoice 2018-05-02 14:34:14 +05:30
Shreya
c804f424ab update reference fields on both invoices 2018-05-02 14:34:14 +05:30
Shreya
79584b1cbd validations to check price list and currencies 2018-05-02 14:34:14 +05:30
Shreya
99ae0439d7 mapping of relevant fields 2018-05-02 14:34:14 +05:30
Shreya
0bd987ab03 validations before routing to invoice 2018-05-02 14:34:14 +05:30
Shreya
ed80cf1f2e Inter company invoice reference link field 2018-05-02 14:34:14 +05:30
Shreya
30b2480cfe make inter company invoice button on Invoices 2018-05-02 14:34:14 +05:30
Shreya
462e18ad2e Allowed To Transact With child table in Customer & Supplier 2018-05-02 14:34:14 +05:30
Faris Ansari
5df63e36d4 Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix 2018-05-01 10:52:15 +05:30
Faris Ansari
bd99606a14 Change msgprint to unobtrusive alert 2018-05-01 10:52:02 +05:30
Zarrar
b0a46f397a display customer's name while printing receivable report (#13830) 2018-04-30 19:40:18 +05:30
Nabin Hait
3652a62b55 minor fixes 2018-04-30 19:32:29 +05:30
Faris Ansari
8be895091e Set is_pos to 0 in Opening Invoice Tool (#13810) 2018-04-30 11:13:06 +05:30
AravindPranera
805f09a3fe Accounts receivable aging based on supplier due date (#13801) 2018-04-26 18:02:37 +05:30
deepak-mnt
b712d1905d Override after_rename method to fetch cost center number on changing from title 2018-04-26 17:04:06 +05:30
deepak-mnt
b379998961 Added Update Cost Center Number button and it's functionality 2018-04-26 17:00:08 +05:30
Nabin Hait
dc75be8b6c Show company column in order in consolidated financial statement 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
4110e00b2d [Fix] general ledger group by validation 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c [Fix] Profit and loss statment 2018-04-26 12:16:38 +05:30
Nabin Hait
f164203520 Fixed merge conflict 2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de Consolidated financial statement (#13678) 
* added fields to support treeview

* tree file added, nestedset implemented

* patch added to reload doc and configure lft rgt

* Added consolidated financial statement report
 2018-04-26 12:16:18 +05:30
rohitwaghchaure
fb9af38106 Group by party in general ledger report (#13649) 
* Group wise Ledger for Customer and Supplier

* commonify group by fields
 2018-04-26 12:16:18 +05:30
Nabin Hait
1c13e70d13 New doctypes for HR and Accounting (#13652) 2018-04-26 12:12:29 +05:30
Saurabh
63590496c1 [fix] resolved merge conflicts 2018-04-25 11:32:54 +05:30
rohitwaghchaure
57914f140e [HotFix] Taxes not adding in POS sales invoice (#13776) 2018-04-24 19:19:47 +05:30
Shreya Shah
4dc453d131 Loan Management for the Members (Non Profit Module) (#13149) 
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account

* Patch added

* Dynamic link fields 'applicant' and 'applicant_type'

* Member link visible only if domain non profit is active

* Modified loan_dashboard

* Make Repayment Entry button

* Common file loan_common.js for loan and loan_application

* repayment schedule rows selection in dialog

* validation if repayment amount > total paid amount

* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month

* fetch nowdate if disbursement date not found

* Rebased with develop

* updated non-profit module page

* updated patch for renamed fields

* dialog to select repayment entries

* hidden field to store reschedule paid status

* update paid check in loan on journal entry updation

* calculate total paid

* updated docs

* codacy fix
 2018-04-24 12:19:36 +05:30
Saurabh
9738d52d5f Merge branch 'master' into develop 2018-04-24 12:09:40 +05:30
Rohit Waghchaure
31edddace6 [Fix] Tax not changes when user change the POS profile in the sales invoice 2018-04-24 11:43:31 +05:30
Saurabh
2e7a45dbb4 resolved merge conflicts 2018-04-24 11:16:13 +05:30
Deepak kumar
022ac50160 Reverse Journal Entry (#13637) 
* [Fix] #13605

* fixes codacy

* minor changes

* Added naming series for reverse journal entry

* added reference_type and reference_name
 2018-04-24 10:52:28 +05:30
tundebabzy
dbdf462e56 fix conflict 2018-04-22 23:49:26 +01:00
tundebabzy
f65ee888c0 spelling: canceled --> cancelled 2018-04-22 23:43:08 +01:00
Nabin Hait
c36524ec54
Update chart_of_accounts.py 2018-04-20 11:00:20 +05:30
Shreya Shah
44e719d64c [Enhancement] Leave Application and Expense Claim (#13645) 
* child table employee expense approver

* set query in department

* mandatory approver check in hr settings

* triggers on leave and expense approver

* fetch all parent approvers from department hierarchy

* fixes

* patch to move employee approvers from employee to department

* removed hard coding of roles

* modify approvers list query

* commonified functions

* patch

* renamed standard reply occurrences

* removed leave approvers table from Employee master

* email templates for leave application notification

* set default email templates for leave in hr settings

* notify by email template

* approval status in expense claim

* render template in patch

* removed unused code

* Single child table department approver

* read instead of render template
 2018-04-19 20:58:52 -08:00
Saurabh
5b7503c074
Merge pull request #13691 from saurabh6790/supp_180417_1 
[hotfix] multiple fixes
 2018-04-19 15:57:35 +05:30
Zarrar
59f7b8c4a1 issue routing to report (#13710) 2018-04-18 02:56:02 -08:00
Saurabh
46ffbb74ff fix cheque print measurements 2018-04-17 20:44:37 +05:30
tundebabzy
caae0f4dcc Merge branch 'develop' into new-subscription 2018-04-17 09:34:04 +01:00
matmyers
742da8cfce removed duplicate keys (#13675) 2018-04-17 12:20:57 +05:30
Saurabh
46743d00d6 Merge branch 'master' into develop 2018-04-17 12:00:21 +05:30
Saurabh
f2a941b1a4 [fix] check if supplier value exists (#13616) 2018-04-15 21:37:14 -08:00
Sathisha Poojary
16ce8ed7d5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-04-14 12:05:11 +05:30
Faris Ansari
ed34a442a8 Obey currency filter in financial statement prints #pdd (#13648) 2018-04-13 21:34:00 -08:00
Nabin Hait
642d39098a Fixed merge conflict 2018-04-13 14:38:57 +05:30
Faris Ansari
f8dd4c2d7b
[fix] Financial report column values during print (#13627) 2018-04-12 17:28:40 +05:30
Siddhi Sawant
a0bbc0846b GST purchase invoice with tax breakup details (#13561) 2018-04-12 14:50:48 +05:30
rohitwaghchaure
2ea593bdd8 [Fix] POS Profile data not set in the sales invoice (#13568) 2018-04-12 13:37:08 +05:30
Sathisha Poojary
99e3ca0f67 Create a new doctype for bank so that we can suport other 
bank statements dynamically.
 2018-04-07 19:00:05 +05:30
Sathisha Poojary
6b8eb645c4 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-04-07 16:41:43 +05:30
Nabin Hait
e9638be032 fixed merge conflict 2018-04-06 15:18:27 +05:30
Rushabh Mehta
dccfb54a0f
[fix] [ux] allow account to be created via form (#13509) 2018-04-06 10:28:08 +05:30
rohitwaghchaure
aa7cddef5c
Merge pull request #13511 from rohitwaghchaure/table_styling 
[Fix] Width and margin for account receivable pdc print format
 2018-04-04 16:34:21 +05:30
Rohit Waghchaure
3d2b3d37d4 [Fix] Width and margin for account receivable pdc print format 2018-04-04 16:01:33 +05:30
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
rohitwaghchaure
eedc0ac681 [Fix] chart of accounts root type is mandatory issue in charts.erpnext.com (#13467) 2018-04-02 12:49:38 +05:30
Britlog
220864b4f7 Allow decimal quantities in pos (#13471) 2018-04-02 10:55:04 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes (#13420) 2018-04-02 10:43:46 +05:30
Zarrar
e9ca5e81d2 hide add_child for root node (#13444) 2018-04-02 10:40:39 +05:30
Nabin Hait
edd320e338
Optimisation of warehouse_account_map (#13454) 2018-04-02 10:30:17 +05:30
Nabin Hait
af98f5d14d
Sort accounts by account number in financial statements (#13423) 2018-04-02 10:14:32 +05:30
Manas Solanki
0289ad285f fix the route filters and payment account (#13447) 2018-04-02 10:13:22 +05:30
Sathisha Poojary
1de5669574 Rename Bank Statement Settings appropriately and allow auto 
populating some settings for supported banks
 2018-03-31 10:30:34 +05:30
Sathisha Poojary
f698a1bcbe Minor typo with major error 2018-03-31 01:19:52 +05:30
Sathisha Poojary
f069e1c83c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-31 00:55:56 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30
Rohit Waghchaure
ace68cd283 [Fix] Alignment and date issue in PDC report 2018-03-28 15:53:29 +05:30
Nabin Hait
6c35822a35 Merge branch 'master' into develop 2018-03-28 10:40:14 +05:30
Sathisha Poojary
148c4f9724 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-28 00:27:32 +05:30
Sathisha Poojary
0512eec54b Some minor changes addressing manual doctype renaming issues 2018-03-28 00:22:59 +05:30
Shreya Shah
c0201877dd fixed column fieldnames for translations (#13406) 2018-03-27 18:45:42 +05:30
Nabin Hait
b9c82b9790 Fixed merge conflict 2018-03-27 14:25:27 +05:30
Shreya Shah
149f7ee875 [Fix] General Ledger Report (#13374) 
* error fix if party_type = student or shareholder

* clear party filter when party_type changes to avoid error throw

* dict with values of party_name in utils.js

* fetch party_name from erpnext.utils.get_party_name

* Update general_ledger.py
 2018-03-27 11:29:25 +05:30
Sathisha Poojary
0b5fea1491 Initial changes to manually migrating bank statemet work from 
app to erpnext
 2018-03-26 01:12:18 +05:30
Nabin Hait
061d912749 Fixed merge conflict 2018-03-23 16:20:27 +05:30
Shreya Shah
9bcadf8126 Tax Id in some reports and print formats (#13373) 
* tax-id in sales and purchase registers

* tax-id in general ledger print_format

* tax-id in accounts payable

* tax-id in accounts receivable
 2018-03-23 15:04:37 +05:30
Nabin Hait
80a9f523d5 Minor fix AR/AP summary report 2018-03-23 13:02:27 +05:30
pawan
53a4d2c430 [fix] #13352 2018-03-21 09:19:36 +05:30
Siddhi Sawant
c672530210 [hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats (#13316) 
* Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats

* Update gst_pos_invoice.json

Updated its 'disabled' property.

* Update pos_invoice.json

Updated its 'disabled' property.

* Shows change amount only if it exists

* Updated disable property of print formats
 2018-03-20 14:31:14 +05:30
Nabin Hait
8a8966ce9b minor fix 2018-03-20 11:19:57 +05:30
Saurabh
2777fd4332 [fix] validate minimum transaction amount in Payment Request for selected payment gateway (#13328) 2018-03-19 18:29:01 +05:30
Achilles Rasquinha
1e95323679 Fixed dict_keys concatenation 2018-03-18 10:08:43 +05:30
Nabin Hait
c8cd4ba6f7 Merge branch 'master' into develop 2018-03-15 12:38:43 +05:30
Nabin Hait
70abac0061 Get territory from sales invoice 2018-03-15 12:19:16 +05:30
Nabin Hait
3707242770 Fixed merge conflict 2018-03-13 16:15:41 +05:30
Nabin Hait
89346967da
Reverted #13259 (#13291) 2018-03-13 16:01:11 +05:30
Nabin Hait
97e890d0b3
Fix in unallocated amount calc in payment entry (#13288) 2018-03-13 15:57:34 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI (#13290) 2018-03-13 15:46:59 +05:30
tundebabzy
0125f7b130 rename to Subscription and transfer present Subscription records to Auto Repeat in frappe 2018-03-12 13:51:47 +01:00
Nabin Hait
2f493731ec Fixed merge conflict 2018-03-12 15:49:59 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting (#13195) 
* [fix] #8427

* review comments changes

* Validation for reserved warhouse

* code improvements

* alignment

* test case

* message changes

* default warehouse / remove validation / change sql

* fix

* patch

* Fixed merge conflict

* Fixes and cleanups of reserve qty for subcontracting

* set from_warehouse only if purchase_order and purpose found (#12398)

* [HotFix] Validation issue for subcontract stock entry (#12127)

* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py

* Fixes and cleanups of reserve qty for subcontracting

* patch fixed

* Reload bin in patch

* [fix] set source warehouse in stock entry for manufacture

* [fix] #8540

* code alignment

* code alignment

* Move target warehouse validation to submit

* validation code improvement

* code changes for single stock entry

* validation fix

* call make_rm_stock_entry

* remove old stock entry method/rewrite test case

* Don't set bom_no against raw materials while trasferring items for sub-contracting

* minor fix
 2018-03-12 14:12:12 +05:30
Shreya Shah
69d9f51dbb if price list not found, set default selling/ buying price list from settings (#13259) 2018-03-12 11:15:49 +05:30
Prateeksha Singh
9362cf37e0 [charts] update charts API 2018-03-12 09:54:56 +05:30
tundebabzy
2970630ed2 Merge branch 'develop' into new-subscription 2018-03-12 02:00:34 +01:00
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
Achilles Rasquinha
138a4850fe
Merge pull request #13252 from achillesrasquinha/py3 
sort by name accounts for trial balance.
 2018-03-09 15:23:28 +05:30
Achilles Rasquinha
dc61c6b975 sort by name accounts 2018-03-09 15:23:08 +05:30
Achilles Rasquinha
1d7665fca1 sort by name accounts 2018-03-09 15:22:20 +05:30
tundebabzy
3d26003c1f add column breaks to Subscription 2018-03-09 09:37:06 +01:00
tundebabzy
8889b70ba1 Merge branch 'develop' into new-subscription 2018-03-09 09:10:48 +01:00
Achilles Rasquinha
b4de7e3d07 removed has_key, used pythonic in (#13236) 
* removed has_key, used pythonic in

* Update bom.py
 2018-03-09 12:35:47 +05:30
tundebabzy
e69747ca6d [Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243) 
* add mode of payment field to Payment Term

* add mode of payment field to Payment Terms Template Detail

* add mode of payment field to Payment Schedule

* add mode of payment in `get_payment_term_details`
 2018-03-09 12:23:53 +05:30
rohitwaghchaure
acd3479269 Bank POS transactions in bank reconciliation (#13225) 2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82 [Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233) 2018-03-08 16:21:13 +05:30
Achilles Rasquinha
908289d40a [FIX] filter to list 2018-03-08 13:10:51 +05:30
Achilles Rasquinha
9050998e06 [FIX] use text_type instead of unicode, use cmp from past.builtins 2018-03-08 12:55:41 +05:30
tundebabzy
1643cce479 fetch journal entry details (#13218) 2018-03-08 11:17:17 +05:30
rohitwaghchaure
bbd9b71547 Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043) 2018-03-07 15:39:40 +05:30
Nabin Hait
c50d7446b5 Merge branch 'master' into develop 2018-03-07 13:09:07 +05:30
Saurabh
a65b28772f [fix] setup_party_account_field on init 2018-03-06 18:22:01 +05:30
Nabin Hait
c43c95e0aa Fixed merge conflict 2018-03-05 14:54:44 +05:30
tundebabzy
458a1fe61a codacy 2018-03-03 18:11:48 +01:00
tundebabzy
ef605d5f00 codacy 2018-03-03 18:03:04 +01:00
tundebabzy
3b1251ef47 codacy tinzz 2018-03-03 17:36:07 +01:00
tundebabzy
2379451b68 codacy tinzz 2018-03-03 17:18:47 +01:00
tundebabzy
fbdd5d30e9 more tests and bug fixes 2018-03-03 11:19:18 +01:00
tundebabzy
024c28acf7 fix proration logic to reduce possibility of rounding errors 2018-03-03 10:32:02 +01:00
tundebabzy
79a01561d5 enhancement: do nothing if cancel_sbscription is called for cancelled subscription 2018-03-03 07:39:44 +01:00
tundebabzy
d43422c18e enhancement: ensure subscription is cancelled before attempting to restart 2018-03-03 07:37:59 +01:00
tundebabzy
e13570f343 codacy review 2018-03-02 12:27:12 +01:00
tundebabzy
9e863b9572 Merge branch 'develop' into new-subscription 2018-03-02 11:10:27 +01:00
tundebabzy
c15dc21b7d clean up 2018-03-02 11:00:15 +01:00
tundebabzy
49d34df8f4 more tests 2018-03-02 10:16:57 +01:00
tundebabzy
688fd6b205 prorate invoice when cancelling subscription 2018-03-02 10:16:42 +01:00
tundebabzy
16afa8765e tiny refactor of invoice setting logic 2018-03-01 17:16:41 +01:00
tundebabzy
9df4f0bd43 fix: apply_discount_on field should be of type Select not Data 2018-03-01 17:12:43 +01:00
tundebabzy
8670c85827 make sure default apply_discount_on is set when creating invoice 2018-03-01 17:11:14 +01:00
tundebabzy
ca5cf35a99 fix: task should explicitly call commit and rollback if error 2018-03-01 17:06:39 +01:00
tundebabzy
36c18c913e docstrings 2018-03-01 16:44:10 +01:00
tundebabzy
0ec445214c hook to hourly scheduler 2018-03-01 11:54:32 +01:00
tundebabzy
78fb12663a fix test 2018-03-01 11:27:48 +01:00
tundebabzy
b91ec79494 update tests and more tweaks 2018-03-01 10:47:00 +01:00
tundebabzy
7eabbd93e1 update start date alone after restarting subscription 2018-03-01 09:09:23 +01:00
tundebabzy
2a11c18383 set initial invoice period based on subscription start 2018-03-01 08:47:38 +01:00
tundebabzy
a93fa16bce freeze screen while waiting for updates on subscription 2018-03-01 08:45:56 +01:00
tundebabzy
328adedbc8 adds start field to record subscrption start date 2018-03-01 08:45:01 +01:00
Nabin Hait
c10bbd6aa7
Editable unallocated amount in pe (#13130) 
* editable unallocated amount in payment entry to handle multi currency

* set unallocated amount on server side

* some minor fixes

* Fixes in territory patch

* removed print

* minor fixes
 2018-03-01 13:14:14 +05:30
Rohit Waghchaure
855d843e55 [Fix] Sales invoice email prompt not working 2018-03-01 13:06:01 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008) 
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
 2018-03-01 10:59:21 +05:30
tundebabzy
d9fec69a70 update test case, fix bugs 2018-03-01 05:34:02 +01:00
tundebabzy
8f37926ca8 add ability to cancel, restart and refresh subscription 2018-03-01 04:57:23 +01:00
Achilles Rasquinha
646522886c self.assertEqual 2018-02-28 21:13:51 +05:30
tundebabzy
2cccad0274 more tests and quick fix 2018-02-28 12:45:09 +01:00
tundebabzy
a5bc057ad4 adds missing 'translatability' 2018-02-28 12:24:16 +01:00
tundebabzy
86ee455cbc more tests and bug fix 2018-02-28 12:21:08 +01:00
tundebabzy
b3d5777e55 more test cases and bug fixes 2018-02-28 12:11:19 +01:00
Achilles Rasquinha
96698c9a77 Use range instead xrange (#13128) 
* Use range instead of xrange

* convert float to int
 2018-02-28 16:12:51 +05:30
Faris Ansari
72d8509b3d
python 3 fix (#13127) 2018-02-28 12:53:34 +05:30
tundebabzy
3aaf693abd adds task -process 2018-02-28 05:12:18 +01:00
tundebabzy
95a4ca9429 update test cases 2018-02-27 18:09:06 +01:00
tundebabzy
9bf029a16e generate new invoice only when current_invoice_end is past 2018-02-27 15:19:02 +01:00
Achilles Rasquinha
11a5f78d3e
Merge pull request #13070 from achillesrasquinha/py3 
[FIX] sorting multiple compares
 2018-02-27 19:48:25 +05:30
tundebabzy
45b6a1719f refactor: 
- current_invoice _start and end should be determined by trial period or billing period
- adds new functions to get billing period data
 2018-02-27 15:14:19 +01:00
tundebabzy
c634ca8737 adds validation to billing_interval_count in Subscription Plan 2018-02-27 14:12:39 +01:00
tundebabzy
3c26a7e862 adjusts query so multiple plans can be used to create single invoice 2018-02-27 09:36:29 +01:00
tundebabzy
559d01e176 allows to rename subscription plan 2018-02-27 09:13:35 +01:00
tundebabzy
07313c281a adds more assertions to test cases 2018-02-27 09:00:13 +01:00
tundebabzy
048bcbf080 more tests and code fixes 2018-02-26 22:17:06 +01:00
tundebabzy
b84e9519c2 Subscriptions doctype - subscriber should be set only once 2018-02-26 20:35:20 +01:00
tundebabzy
1ea5055967 fix another date comparison bug 2018-02-26 20:17:59 +01:00
tundebabzy
4d8175f9d9 adds test cases and fix resulting bugs 2018-02-26 18:56:05 +01:00
tundebabzy
cd700efc0b only generate invoice after_insert if subscription is not in trial period 2018-02-26 16:26:36 +01:00
tundebabzy
0091c86e80 fix date comparison bug 2018-02-26 16:18:55 +01:00
tundebabzy
08a11b4d1f sets default for days_until_due to 0 2018-02-26 16:13:45 +01:00
tundebabzy
d3fdcd9da5 set after_insert methods: 
- if subscription is not in trial period, generate sales invoice
 2018-02-26 16:10:47 +01:00
tundebabzy
b72aac6729 adds validation: 
- ensure trial period dates are in order
 2018-02-26 15:56:47 +01:00