Commit Graph

21581 Commits

Author SHA1 Message Date
Shreya Shah
70a57e08fd New Report Employee Advance Summary (#13040)
* New Report Employee Advance Summary

* JSON style column definition
2018-02-26 15:58:57 +05:30
rohitwaghchaure
8ffd5d40e3 [Fix] UX for delivery trip (#13046)
* [Fix] UX for delivery trip

* Fixed test cases
2018-02-26 12:25:39 +05:30
tundebabzy
9360f81b94 Validity of Quotation #12858 (#13078)
* add new setting for default valid_till date

* codacy cleanup
2018-02-26 12:23:41 +05:30
Nabin Hait
2572b05b35
Update territory and customer_group patch optimization (#13076)
* Update territory and customer_group patch optimization

* Update update_territory_and_customer_group.py
2018-02-25 10:45:24 +05:30
Zarrar
4a0d27078e optimize patch for faster execution (#13068) 2018-02-23 17:41:32 +05:30
Nabin Hait
802819df9d Merge branch 'master' into develop 2018-02-23 16:59:44 +05:30
Nabin Hait
4ff4d185f7 Merge branch 'hotfix' 2018-02-23 16:59:42 +05:30
Nabin Hait
d54953e419 bumped to version 10.1.4 2018-02-23 17:29:42 +06:00
Zarrar
339426c926 fix permission issue for stock balance report - Item Group (#13069) 2018-02-23 16:58:55 +05:30
Nabin Hait
7570774ebe Merge branch 'master' into develop 2018-02-23 16:49:43 +05:30
Nabin Hait
489ff6e21c Merge branch 'hotfix' 2018-02-23 16:49:41 +05:30
Nabin Hait
d12fb58c12 bumped to version 10.1.3 2018-02-23 17:19:40 +06:00
Ameya Shenoy
82048cf3ce verify payment entry amount is positive (#13066)
* verify payment entry amount is positive

* Update sales_invoice.py

* Update sales_invoice.py
2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb [Fix] Item wise sales register report (#13055) 2018-02-23 16:25:30 +05:30
Shreya Shah
70a68897cc auto name on the basis of naming series (#13056) 2018-02-23 16:24:59 +05:30
Shreya Shah
d5b2e39f45 improve validation (#13058) 2018-02-23 16:23:57 +05:30
Frappe PR Bot
239c121f7d [Translation] Updated Translations (#13059) 2018-02-23 16:23:00 +05:30
rohitwaghchaure
dd0fc1084e [Fix] PDC amount, PDC print layout issue (#13062) 2018-02-23 16:20:46 +05:30
Faris Ansari
97b212e348 Patch optimization (#13060)
* Patch fixes

* fix codacy

* Update item_barcode_childtable_migrate.py
2018-02-23 16:19:41 +05:30
Raghavendra Kamath
1a9388acbb Clean inline css found in chapter and grant for loops! (#13038)
* Clean inline css found in chapter and grant for loops!

* Remove redundant css

* remove unwanted ide files and append gitignore

* remove unnecessary line from build.json

* restore import for variable.less

* remove kdev from gitignore
2018-02-23 14:34:44 +05:30
Nabin Hait
d283ee73f3 Fetch timesheet based on project 2018-02-23 12:58:39 +05:30
Nabin Hait
5b9f3b0cd3 Merge branch 'master' into develop 2018-02-22 18:18:36 +05:30
Nabin Hait
93f138eece Merge branch 'hotfix' 2018-02-22 18:18:34 +05:30
Nabin Hait
2b2cf13408 bumped to version 10.1.2 2018-02-22 18:48:34 +06:00
Nabin Hait
7f49b57aaa
Update added_extra_gst_custom_field_in_gstr2.py 2018-02-22 18:17:57 +05:30
Nabin Hait
0e3db275e5 Merge branch 'master' into develop 2018-02-22 18:10:39 +05:30
Nabin Hait
00330f52bd Merge branch 'hotfix' 2018-02-22 18:10:37 +05:30
Nabin Hait
6b69fc7e5d bumped to version 10.1.1 2018-02-22 18:40:37 +06:00
Saurabh
d8cd54dfd0 [fix] remove gstr2 fields from Sales Invoice and Delivery Note too (#13047) 2018-02-22 18:05:40 +05:30
Suraj Shetty
8a41887f68 patch exception fixes (#13037)
* patch exception fixes

* reload daily_work_summary_group_user doctype
2018-02-22 15:56:33 +05:30
tundebabzy
2949e9c5dc
Merge pull request #13036 from tundebabzy/issue-13019
Uncaught Server Exception : adjust_qty_for_expired_items #13019
2018-02-22 11:04:53 +01:00
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
Nabin Hait
15bd3167a8 Merge branch 'hotfix' 2018-02-22 14:39:37 +05:30
Nabin Hait
9b530fb2cb bumped to version 10.1.0 2018-02-22 15:09:37 +06:00
Nabin Hait
06bace9089
Fixed develop version 2018-02-22 14:36:26 +05:30
tundebabzy
c15978fca0 fix indentation 2018-02-22 09:50:49 +01:00
Nabin Hait
cb2264e0b4 Merge branch 'vishdha-leaderboard' into hotfix 2018-02-22 14:00:04 +05:30
Nabin Hait
7d862276af Cleanup and fixes on leaderboard 2018-02-22 13:59:41 +05:30
Nabin Hait
e4fe2d9603 Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard 2018-02-22 11:35:10 +05:30
rohitwaghchaure
23a2b65576 [Fix] BOM Update Tool not update grandparent's exploded BOM (#13026) 2018-02-22 11:32:09 +05:30
tundebabzy
cad22dbe39 Cutomisable Cash Flow Reports (#12969)
* add child doctype - Cash Flow Mapping Account

* adds new doctype - Cash Flow Mapping

* adds new doctype - Cash Flow Mapper

* adds new doctype Cash Flow Mapping Template

* adds new doctype Cash Flow Mapping Template

* adds adjustments to Cash Flow Mapper:
- remove fields from Cash Flow Mapping Template Details
- update in Cash FLow Mapper

* get cash_flow_accouts from Cash Flow Mapping

* change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field

* changes description from 'Net Profit/Loss' to 'Profit for the year'

* set `net_profit_loss` `parent_account` properly

* modify `get_account_type_based_data`:
- changed signature such that `account_type` parameter is now `account_name`
- where clause in query is now based on `name`

* remove zero rows

* de-duplicates row, summing similar accounts in the process

* makes gl sum calculation use `parent_account` as a condition

* add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field

* adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities

* add "Movement in working capital" subheader

* refactor code for readability

* adds new fields to `Cash Flow Mapping`:
- `is_interest_paid` to allow me recognise accounts for 'Interest Paid'
- `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid'

* allow `Cash Flow Mapping` to be renamable

* adds new field - `section_subtotal` useful for only Operating Activities

* changes `Cash Flow Mapping` doctype fields:
- remove `is_income_tax`_field
- add `is_income_tax_liability` field to identify tax payable accounts
- add `is_income_tax_expense` field to identify tax expense accounts in P or L

* calculates and shows tax paid adjustment in cash flow statement

* renames `is_interest_paid` to `is_finance_cost`

* - adds finance costs calculation
- correctly sets opening balance dates

* prevents users from selecting extra options in Cash Flow Mapping

* adds validation to prevent selecting multiple options

* adds new fields to Cash Flow Mapping

* calculate non cash p or l items (2nd pass)

* separates default cash flow generation from custom

* adds new setting to Accounts Settings:
- allow user elect to use customised cash flow report

* clean up

* removes mandatory constraint from accounts field

* allow rename, disallow create and delete

* adds patch to add default Cash Flow Mappers

* refactors custom_cashflow

* add article to explain configuration

* refactor

* further refactor

* final clean up (hopefully)

* clean up for codacy

* more codacy fixes

* more codacy fixes

* fix broken patch

* rename article to .md

* create default mappers after install

* PEP 8

* create the tables in `after_install` call
2018-02-22 11:08:36 +05:30
tundebabzy
27d558c9ef Optionally allow overlap on Timesheet #12893 (#13018)
* give user option to ignore time overlap validation

* move settings to new Projects Settings

* clean up - remove trailing space
2018-02-22 11:05:49 +05:30
rohitwaghchaure
4e8fdf7b3f [Enhance] Quality Inspection Template (#12988)
* [Enhance] Quality Inspection Template

* Test case and patch

* Update make_quality_inspection_template.py
2018-02-22 11:03:48 +05:30
Zarrar
79756c44c9 Update Territory & Customer Group across all transaction (#13004)
* added method for update query based on changes

* patch added

* updated function, moved util function
2018-02-22 10:57:49 +05:30
Shreya Shah
0bde9e11c7 clear log if no attachments (#13023) 2018-02-22 10:55:40 +05:30
tundebabzy
637b242a34 Credit card default account should be debtors #12989 (#13029)
* allow receivable account type in mode of payment

* update `default_account` field description
2018-02-22 10:51:57 +05:30
vishdha
09d56754ea [fix] Codacy issue 2018-02-21 16:10:09 +05:30
vishdha
e9166d7c19 [fix] Sales partner details get from sales Order and company currency details from selected company 2018-02-21 15:35:58 +05:30
vishdha
9a64d4371e [fix] Codacy Issue 2018-02-21 15:35:58 +05:30
vishdha
d4491d361f [new] Filter based on company: 2018-02-21 15:35:58 +05:30