Nabin Hait
852cb64e4f
GST tax invoice print format and more ( #9616 )
...
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608
* Reload gst print format only for Indian users
* Fixes as Codacy
2017-07-05 12:58:19 +05:30
rohitwaghchaure
10a4a13e5e
Remove gst reports for non indian accounts ( #9553 )
...
* remove gst reports for non indian accounts
* [Fix] GSN code auto name
2017-07-04 16:45:29 +05:30
Sagar Vora
067991ee30
[minor] fix autoname for GST HSN Code ( #9536 )
2017-07-01 14:14:14 +05:30
rohitwaghchaure
69279229cc
Merge pull request #8987 from bcornwellmott/bom_convert_uom
...
Added BOM UOM selection for items
2017-06-28 16:28:31 +05:30
Rushabh Mehta
00ae424cac
[regional] ability to send gst reminders to all parties
2017-06-27 17:31:41 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
mbauskar
66e2a510b9
[minor] deleted deprecated reprots and changed the lead.json modified time
2017-06-22 16:57:46 +05:30
Makarand Bauskar
79d36c7c43
Merge pull request #9423 from mbauskar/patch-fix
...
[minor] save the system settings document
2017-06-22 12:49:35 +05:30
mbauskar
4b299ba009
[minor] save the system settings document
2017-06-22 12:46:31 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Makarand Bauskar
0ea5d941e6
Merge branch 'develop' into bom_convert_uom
2017-06-21 21:35:38 +05:30
mbauskar
196f3b1fb8
resolved merge conflicts
2017-06-21 14:38:06 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
bcornwellmott
6561b8ade9
Merge branch 'develop' into bom_convert_uom
2017-06-16 08:29:00 -07:00
Makarand Bauskar
3d6697949c
[minor] fixed the child table field name ( #9328 )
...
* [minor] exclude Other domain from Domains
* [minor] fixed the child table field name
2017-06-16 14:12:28 +05:30
Makarand Bauskar
dd986f659e
Merge branch 'pratu16x7-domainify' into domainify ( #9324 )
...
* bootstrap domains and set active_domain on setup
* [minor] Patch for domain docs
* [minor]
* Update create_domain_docs.py
2017-06-16 13:02:45 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
Rushabh Mehta
e0434ad40e
Merge branch 'develop' into bom_convert_uom
2017-06-15 17:32:27 +05:30
mbauskar
5da3ac63bf
[minor] fixed merge conflicts
2017-06-15 16:09:42 +05:30
Nabin Hait
5aee7d1b70
Change column length of in_words
2017-06-15 15:35:08 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
bcornwellmott
d53dd7f4c9
Merge branch 'develop' into bom_convert_uom
2017-06-13 08:40:24 -07:00
Saurabh
797f2030f8
Merge branch 'master' into develop
2017-06-13 15:20:13 +05:30
mbauskar
f819c93329
[minor] replaced db_save by db_update and added patch to remove the indexes on tabBin
2017-06-13 13:22:34 +05:30
bcornwellmott
5491275b66
Merge branch 'develop' into bom_convert_uom
2017-06-07 08:42:54 -07:00
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
rohitwaghchaure
d2be55b2e0
[Fix] Orders not creating from the POS for new customer if customer name is based on naming series ( #8933 )
...
* [Fix] Orders not creating from the POS for new customer if customer name is based on naming series
* [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile
* added customer name in the search bar of the customer
* search customer by phone number and email id in the POS
2017-06-07 12:04:01 +05:30
tundebabzy
99b734bfd7
Fix #4587 : Status does not display "Pending" in report filter ( #9104 )
...
* adds Material Request to `status_map`
* updates eval condition for Partially Ordered in Material Request map
* changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options
* adds more options to `validate_status`
* adds `set_status` just before saving
* adds `check_for_closed_status` in `before_cancel`
* adds patch to convert status to material request specific status
* adds stricter status update conditions
* changes `update_status` to me `set_status`
* adds checker such that draft status can only change to pending
* renames `check_draft_status` to `status_can_change`
* adds Cancelled to Material Request map
* makes `status_can_change` block any attempt to change a cancelled document
* adds more test cases
* updates what `set_status` checks for before adding comment
* adds patch to rename the present material request status
2017-06-07 12:02:07 +05:30
bcornwellmott
8fa1e03367
Merge branch 'develop' into bom_convert_uom
2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott
0f0b121669
Added BOM UOM selection for items
...
Added patch for BOM Item UOM
Fixed scrap qty issue
Added Scrap Qty update to patch
Reverted test record for production order
2017-05-24 11:12:51 -07:00
Nabin Hait
c795386230
Fixed merge conflict
2017-05-24 18:39:16 +05:30
mbauskar
ff70f38eac
[minor] patch to delete the schools deprecated doctypes
2017-05-24 17:13:16 +05:30
Makarand Bauskar
3b9c2a4438
Added a reference of Sales Invoice in Serial No ( #8855 )
...
* [enhance] added Sales Invoice reference in Serial Number
* [patch] added test cases for Sales Invoice and added patch to copy sales invoice
* [minor] minor fixes in validate_serial_against_delivery_note
* [minor] fixes in sales invoice serial number validation
2017-05-23 18:45:34 +05:30
Nabin Hait
8a27cf3785
Fix status of invoices with negative outstanding, if no return entry ( #8829 )
...
* Move allowance field in Item to the first section to apply it for both stock and non-stock items
* Fix status of invoices with negative outstanding, if no return entry
* get_value included in safe_eval
2017-05-16 12:43:00 +05:30
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Nabin Hait
62d27ab7d3
Reload doctype bewfore renaming margin fields ( #8771 )
2017-05-11 13:26:55 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
Manas Solanki
426b8a14fd
Merge the student group and student batch ( #8663 )
...
* deleted student batch creation tool
* Patch for deleting the doctype and config
* Changes in the student attendance
* Patch for renaming the student batch as student group
* Changes in the student attendance
* Change in the student attendance reports
- Absent student report
- Student Batch-wise attendance
- Student monthly attendance sheet
* Changes in the patch
* Changes in the course schedule
* Changes in the course scheduling tool
* Change in the assessment plan
* Changes in the assessment result tool
* Cleanup
* Changes in the api.py
* create student group from student batch
* delete student batch
* add patch
* remove student batch from config/schools.py
* Delete the depricated doctype with patch
* Changes in patch
* Changes as per PR
2017-05-09 15:32:52 +05:30
mbauskar
e94c6e7b8e
[minor] disabled the instructor role if the company domain is not Education
2017-05-01 11:40:13 +05:30
Nabin Hait
c98f37f91c
Patch for reverting manufacturers table from item
2017-04-28 09:58:41 +05:30
Nabin Hait
b6a8920489
Fixed conflict
2017-04-28 09:58:41 +05:30
mbauskar
9cf6d630e9
[minor] fixes for expense claim status
2017-04-25 13:15:50 +05:30
Nabin Hait
f382373cf4
Merge branch 'develop' into develop
2017-04-19 21:01:19 +05:30
Faris Ansari
695327a513
Duplicate dependencies when project is duplicated
...
- fix frappe/erpnext#8274
2017-04-19 20:48:49 +05:30
Nabin Hait
117be7ddd5
Added a settings in Accounts Settings to disable booking depreciation entry automatically
2017-04-18 14:03:06 +05:30
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
Javier Wong
54d9c9eaf4
Merge branch 'develop' into develop
2017-04-14 18:33:44 +08:00
Javier Wong
9b11d9b45d
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-14 18:24:04 +08:00
mbauskar
3ddfce4f17
[patch] move supplier_address to address_display and set supplier_address in SE
2017-04-13 16:46:41 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Revant Nandgaonkar
d07c041125
[Fix] Addresses linked back to Lead
2017-03-30 23:14:58 +05:30
rohitwaghchaure
afa93c624b
[fix] Reserved qty is not calculating properly in BIN for multi sales UOM ( #8203 )
2017-03-29 17:29:20 +05:30
Nabin Hait
621dcc3c84
Patch order changed for multiple uoms in sales cycle
2017-03-28 13:45:56 +05:30
Dominik Ottenbreit
3938c61996
migrate from manufacturer to manufacturer childtable
2017-03-24 14:24:34 +01:00
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Manas Solanki
d77fac113f
Make All Assessment Group parent in assessment group tree
2017-02-24 15:30:22 +05:30
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
Manas Solanki
f869a679ae
Fixed Student Attendence
2017-02-21 18:49:00 +05:30
Kanchan Chauhan
42f55cf4b1
[Patch] Attendance Date rename field
2017-02-21 13:44:01 +05:30
Nabin Hait
6a85752ead
Merge branch 'hotfix' into remove-joining-datep-validation
2017-02-20 19:31:38 +05:30
Nabin Hait
0d66579e83
Merge branch 'develop' into develop
2017-02-20 19:22:03 +05:30
Nabin Hait
8bb69ff8bf
Fixed merge conflict
2017-02-20 19:01:04 +05:30
Nabin Hait
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
mbauskar
90818080b1
[minor] Configured Auto Close days for Opportunity and Issue
2017-02-17 14:56:00 +05:30
mbauskar
e1e25a0c9d
[minor] auto close opportunity after 7 days
2017-02-17 14:54:50 +05:30
Rohit Waghchaure
4b9d2f2733
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-16 18:53:23 +05:30
Kanchan Chauhan
1b204c8e4e
Accrual Payroll System
2017-02-16 16:30:51 +05:30
Kanchan Chauhan
5f5457085e
Joining date validation removed from Salary Structure
2017-02-06 14:50:39 +05:30
Neil Trini Lasrado
f37d329cf5
Merge branch 'develop' into eval-group
2017-02-02 17:30:10 +05:30
Neil Trini Lasrado
4aabe61197
Patch for renaming evaluation criteria
2017-02-01 19:32:28 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Neil Trini Lasrado
7ff5682193
Merge branch 'develop' into guarding-name
2017-01-27 16:54:50 +05:30
Neil Trini Lasrado
f36ff488c0
Added Guardian Name to Student Master
2017-01-27 16:53:55 +05:30
Rushabh Mehta
710dc5392f
[merge]
2017-01-27 15:48:31 +05:30
Kanchan Chauhan
c948a4fc92
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-23 16:12:45 +05:30
Nabin Hait
1f9d1bb877
Merge branch 'develop' into assessment
2017-01-20 20:09:44 +05:30
Neil Trini Lasrado
16d40cf0a3
Added ability to disable a student in student group/studnet batch
2017-01-20 19:33:09 +05:30
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Rohit Waghchaure
84b827efcd
[Fix] Budget not working properly
2017-01-20 12:33:50 +05:30
Rushabh Mehta
818af75575
[patch] add patch for contact_address_update
2017-01-19 13:08:46 +05:30
Nabin Hait
b064cf39c2
Merge branch 'develop' into fleet-moved-to-hr
2017-01-17 11:05:39 +05:30
Kanchan Chauhan
f80c2b9606
Fleet management moved to HR
2017-01-16 14:38:24 +05:30
Neil Trini Lasrado
38bd62d82d
Merge branch 'develop' into assessment
2017-01-16 12:23:51 +05:30
Nabin Hait
e43a94de4b
Merge branch 'hotfix' into draft_status_issue_after_amend
2017-01-13 13:14:32 +05:30
Rohit Waghchaure
29458836e4
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 12:51:19 +05:30
Kanchan Chauhan
b6114e672f
Patch to add Start and End Date in Salary Slips
2017-01-13 12:05:03 +05:30
Neil Trini Lasrado
5c87455918
Patch for assessment module redesign
2017-01-09 18:26:03 +05:30
Rushabh Mehta
174c3478a1
[fix] item variants not directly shown in website due to route clash
2016-12-27 12:30:30 +05:30
Rushabh Mehta
2a86c32267
[minor] [patch] remove icon if present, fixes #6949
2016-12-20 12:20:39 +05:30
Nabin Hait
201af80706
Fixed merge conflict
2016-12-13 14:30:32 +05:30
Kanchan Chauhan
f0b0db444d
Added Is Active to Sales Person
2016-12-12 19:12:41 +05:30
Nabin Hait
3ef63bef02
Rename and merging of Item and Warehouse and patch to fix deleted bins
2016-12-12 15:37:52 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Manas Solanki
482fa672c2
[Fix] Patch for budget_against
2016-12-08 12:16:29 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Rohit Waghchaure
82fa27c36f
[Fix] Status of sales order and purchase order
2016-12-05 16:32:23 +05:30
Nabin Hait
672ffc0ff4
Update patches.txt
2016-11-25 11:15:20 +05:30
Rohit Waghchaure
b1b328865e
[Enhancement] Currency added in the BOM
2016-11-22 12:52:20 +05:30
Nabin Hait
d855167b9b
Fixed merge conflict
2016-11-21 19:13:22 +05:30
