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
