1840 Commits

Author SHA1 Message Date
Nabin Hait
b02c109e1d Cleanup and fixes on GSTR-2 2018-02-05 16:09:51 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
rohitwaghchaure
32a5f38595
Merge pull request #12633 from vishdha/issue_12388
[fix] Sales order link to purchase order not working fixed
2018-01-31 17:30:43 +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
vishdha
df1653827f [fix] Patch for material request to purchase order added 2018-01-31 15:11:24 +05:30
Nabin Hait
e37e5d6134 minor fix in patch for mariadb version 2018-01-31 15:00:18 +05:30
Nabin Hait
bc640fe6a6 minor fix in old patch 2018-01-30 19:26:28 +05:30
Nabin Hait
927d13fadb Minor fix in old patch 2018-01-30 15:59:44 +05:30
vishdha
e03e4a581f [fix] Fetch correct Tax Details 2018-01-29 22:55:23 +05:30
Saurabh
d581ff40ea Merge branch 'master' into develop 2018-01-29 17:42:37 +05:30
Saurabh
e1e690541c set payment term name in payment_terms (#12693) 2018-01-29 17:39:56 +05:30
Saurabh
03f6b3e588 resolved merge conflicts 2018-01-29 16:25:33 +05:30
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
Vishal Dhayagude
c463c0684d [Report] GSTR - 1 CDNR Report (#12554)
* [wip] cdnr

* [WIP] cdnr with optional data

* [wip] Export GSTR-1

* [minor] Minor changes in export

* [new] Custom field added for GST

* [fix] Minor changes in GSTR1 Report

* [minor] Minor changes in gstr1

* [fix] Codacy Fixed

* Update setup.py
2018-01-26 11:27:22 +05:30
Shreya
1416567139 patch fix for leave-workflow 2018-01-25 17:06:14 +05:30
Shreya
61cf49dd07 workflow patch fix 2018-01-24 18:50:01 +05:30
rohitwaghchaure
8df0556af5
Merge pull request #12587 from shreyashah115/leave-workflow
Refactor Leave Application
2018-01-24 15:04:17 +05:30
Shreya
a8a952deff check if workflow_state_name already exists 2018-01-24 15:00:54 +05:30
Rushabh Mehta
29bc14d242 [fix] ficher_des_ecritures patch 2018-01-24 14:39:04 +05:30
Shreya
a309a871b5 Codacy fix 2018-01-24 13:56:16 +05:30
Shreya
a400e7b568 Fixed as per the review 2018-01-24 13:30:20 +05:30
Charles-Henri Decultot
90657fb566 FEC report for France (#12446)
* FEC report for France

* Codacy correction
2018-01-23 15:40:14 +05:30
Shreya
5164997db7 delete column status 2018-01-22 14:13:03 +05:30
Shreya
dd66bc03c7 fixes 2018-01-22 12:28:38 +05:30
Shreya
fc0e8e5c6a modified patches.txt 2018-01-22 12:26:41 +05:30
Shreya
117ddac033 patch to create workflow for existing leave applications 2018-01-22 12:26:41 +05:30
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
Rohit Waghchaure
95adb60a8f Fix patch 2018-01-18 15:52:52 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
Manas Solanki
bba5fd7a38 Assessment module addition (#12417)
* add academic session details in the Assessmet Plan

* add the academic session and few details in the assessment result

* fix codacy
2018-01-12 16:21:09 +05:30
Nabin Hait
687dc6a424 patch fixed 2018-01-10 14:51:19 +05:30
Nabin Hait
2f51c6900b Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:20:05 +05:30
Nabin Hait
07e5376043 Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:19:59 +05:30
Nabin Hait
cab8dfc5fb Fixed merge conflict 2018-01-05 14:15:39 +05:30
rohitwaghchaure
d45266881a [Enhance] New print format for UAE/KSA for vat/excise (#12202)
* [Enhance] New print format for UAE/KSA for vat/excise

* Fixed spelling
2017-12-28 14:20:13 +05:30
Nabin Hait
ca674bec42
Set numeric ranges in Item tamplate if blank (#12199) 2017-12-28 12:35:11 +05:30
Fahim Ali Zain TP
5f7cedb206 Fix v8 to v10 migration issue (#12177) 2017-12-27 17:14:54 +05:30
Nabin Hait
c65279b584 Reloaded account doctype in UAE Vat patch 2017-12-25 15:02:54 +05:30
Manas Solanki
5807cd8e6f Set the guardian role automatically. (#12136)
* Add the guardian role for parent portal

* invite guardian as user
2017-12-22 10:50:10 +05:30
Prateeksha Singh
8b0b56dda4 [Setup Wizard] Use setup stages (#12000)
* setup working with packages imports for operations

* setup stages

* use setup_stages hook

* remove commit from app setup
2017-12-21 11:55:58 +05:30
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
33c9da9ab1
Patch to update due_date in GLE, Journal Entry and Payment Entry (#12093) 2017-12-19 11:18:36 +05:30
Shreya Shah
d903bd6a70 patch fix for asset (#12079) 2017-12-18 12:31:23 +05:30
Nabin Hait
4c816a1054
Patch to set calculate_depreciation if schedule already exists (#12061) 2017-12-16 11:17:36 +05:30
rohitwaghchaure
e3b5c0f727 [fix] Regional print format showing for other countries users (#12045) 2017-12-16 10:53:53 +05:30
Faris Ansari
c7b92b73a6 fix patches for v7 sites (#12043) 2017-12-15 16:49:11 +05:30
Saurabh
65b3356dee [fix] merge case in rename_translated_domains_in_en #11879 (#12007) 2017-12-14 16:52:50 +05:30
rohitwaghchaure
24e5265281 [enhance] Search customer using primary contact mobile number (#11998)
* [enhance] Search customer using primary contact mobile number

* Update build.json
2017-12-14 13:06:21 +05:30
Zarrar
6e0acbe4d0 Patch to copy old field data to new field (#11997)
* 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