Commit Graph

21069 Commits

Author SHA1 Message Date
Zarrar
0acf687e20 Land unit tree ()
* improvise tree structure

* remove set intro code

* remove all land units dependency

* test case corrected
2017-12-18 14:01:07 +05:30
Manas Solanki
2bca5a98ae add the data import icon in the desktop.py () 2017-12-18 13:55:30 +05:30
rohitwaghchaure
e067beda49 [fix] Promise issue, in cart against item displaying zero values () 2017-12-18 12:32:49 +05:30
Shreya Shah
d903bd6a70 patch fix for asset () 2017-12-18 12:31:23 +05:30
Nabin Hait
4c816a1054
Patch to set calculate_depreciation if schedule already exists () 2017-12-16 11:17:36 +05:30
rohitwaghchaure
e3b5c0f727 [fix] Regional print format showing for other countries users () 2017-12-16 10:53:53 +05:30
rohitwaghchaure
938a1fee80 [minor] Tax id of supplier not fetching in purchase invoice () 2017-12-16 10:51:07 +05:30
Kenneth Sequeira
9bceb388c8 changed dead YouTube link for videos () 2017-12-16 10:50:29 +05:30
rohitwaghchaure
1bc47fa43c [fix] Sales order tax not fetching on the sales invoice () 2017-12-16 10:49:58 +05:30
Ameya Shenoy
eb8446f01f Agri fixes ()
* crop_cycle, moving point in geojson from js to py

* crop fields are fetched into crop_cycle

- fixes 

* area is a readonly field

- fixes 

* [agri] land unit child geojson bug fixed

* set_intro null if parent field entered, list only group nodes

* minor fixes
2017-12-16 10:43:35 +05:30
Nabin Hait
2a9dc9019a Fixed closing debit/credit in general ledger report 2017-12-15 19:41:20 +05:30
Prateeksha Singh
228c341d12
[setup-progress] Rerun letterhead slide patch 2017-12-15 18:32:27 +05:30
Nabin Hait
2afcff1852 Get outstanding invoices on payment entry 2017-12-15 17:32:03 +05:30
Nabin Hait
b9ca91a832
Update company.py 2017-12-15 17:23:11 +05:30
Faris Ansari
c7b92b73a6 fix patches for v7 sites () 2017-12-15 16:49:11 +05:30
Manas Solanki
53e47e6ba5 frappe call only if item code or serial no is ther () 2017-12-15 15:47:52 +05:30
Nabin Hait
13435dddcc BOM: Fetch valuation rate of raw materials from Item master if not found based on SLE 2017-12-15 15:46:43 +05:30
rohitwaghchaure
78a17355be [fix] Item search in POS () 2017-12-15 15:38:12 +05:30
Nabin Hait
6a640b78c4 Minor fixes in payroll entry and opening invoice tool 2017-12-15 15:34:14 +05:30
rohitwaghchaure
5a344576b8 [minor] Address fix () 2017-12-15 13:14:36 +05:30
Nabin Hait
9771b9376d Merge branch 'master' into develop 2017-12-15 12:53:56 +05:30
Nabin Hait
d257af910b Merge branch 'hotfix' 2017-12-15 12:53:55 +05:30
Nabin Hait
2f22d2b307 bumped to version 9.2.23 2017-12-15 13:23:54 +06:00
rohitwaghchaure
ce8adecbad Incoming rate fixes () 2017-12-15 12:13:50 +05:30
Jignesh Greycube
7f13283b66 Renamed Tax Breakup Label to In Words ()
Detailed Invoice  Print format, Renamed "Tax Breakup" Label  to "In Words"
2017-12-15 11:59:30 +05:30
tundebabzy
1d459c4327 Make Journal entry from Invoice based on Payment Terms (due date) ()
* 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
Vishal Dhayagude
d377018695 [fix] Shipping charges change on qty, item_code and conversion_factor trigger ()
* [wip] shipping rule

* [wip] Shipping Rule tax auto calculate

* [wip] Shipping Rule

* [new] Shipping charges change on different triggers

* [minor] Removed unnecessary comments

* [fix] Minor Changes in function calls
2017-12-14 18:06:02 +05:30
Pawan Mehta
d6cb617520 Fix 11948 - Sales Payment Summary ()
* [fix] 

* [fix] 

* [fix] 

* codacy issues
2017-12-14 18:04:31 +05:30
Nabin Hait
6b0d4bd01b Minor fixes related to employee advance 2017-12-14 18:03:10 +05:30
Saurabh
65b3356dee [fix] merge case in rename_translated_domains_in_en () 2017-12-14 16:52:50 +05:30
rohitwaghchaure
2b95a5438b POS batch fixes () 2017-12-14 16:06:23 +05:30
Vishal Dhayagude
ee7b4f00f8 [minor] Chapter head link with Member () 2017-12-14 13:26:22 +05:30
Nabin Hait
d0249b0880
Employee advance ()
* 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
tundebabzy
02b4b5f526 Payroll Entry () ()
* add functions for tracking related salary slips

* PEP 8 style

* put buttons into Make based on context

* add function to test for bank entry journal

* refeactor `add_bank_entry_button`

* "View Salary Slips" made a standalone secondary button

* set_inner_btn_group for Make Bank Entry

* refresh button after journal is submitted

* edit javascript test case

* codacy

* fix as per review

* no longer use $c
2017-12-14 13:15:28 +05:30
rohitwaghchaure
24e5265281 [enhance] Search customer using primary contact mobile number ()
* [enhance] Search customer using primary contact mobile number

* Update build.json
2017-12-14 13:06:21 +05:30
Shreya Shah
a2cfd97cd7 fetch party name () 2017-12-14 12:42:01 +05:30
Umair Sayed
4667cb2f62 Update implementation-strategy.md () 2017-12-14 12:21:47 +05:30
Zarrar
6e0acbe4d0 Patch to copy old field data to new field ()
* patch to copy old fields data to new ones

* fix for patches related to project

* use rename_field function, copy if only field present
2017-12-14 12:21:00 +05:30
rohitwaghchaure
5759258dcf [fix] Added total closing in general ledger () 2017-12-13 18:57:37 +05:30
rohitwaghchaure
40f5d8edd4 [fix] Pull subcontracted item if subassembly is not defined () 2017-12-13 18:51:05 +05:30
Ameya Shenoy
cc05c0b348 Agri fixes ()
* minor fixes in agri

* updated desktop.py

* [agri] fixed recreation of dotypes in setup.py

* setup_wizard changes

- converted agriculture from alpha to beta
- rearranged the domains alphabetically

* [agri] linked doctype is collapsible
2017-12-13 18:50:39 +05:30
Shreya Shah
8cad3f12a2 Salary Slip not updating when adding/removing Timesheet links ()
* timesheet on salary slip

* changes

* cal total wages

* calculate gross_pay and net_pay

* codacy fix
2017-12-13 18:43:01 +05:30
Nabin Hait
aaf378e340
Validate numeric attribute value based on range defined in template () 2017-12-13 18:40:52 +05:30
Zarrar
de8f6120f3 [Fix] Restrict domain specific roles ()
* restrict roles to its specific domain

* missing hook for Non Profit
2017-12-13 18:36:08 +05:30
rohitwaghchaure
659b46832c [fix] Patch () 2017-12-13 18:35:22 +05:30
Saurabh
aa66fa17d7 key fix in demo setup completion () 2017-12-13 18:34:43 +05:30
Manas Solanki
56f5b5f75c Update the desktop.py ()
Remove the data import desktop icons
2017-12-13 11:28:18 +05:30
Nabin Hait
0f97eda7c9 Merge branch 'master' into develop 2017-12-12 19:17:53 +05:30
Nabin Hait
96d6498226 Merge branch 'hotfix' 2017-12-12 19:17:51 +05:30
Nabin Hait
66456dae34 bumped to version 9.2.22 2017-12-12 19:47:51 +06:00