Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,997 Commits 3 Branches 0 Tags 1 GiB
558fcc140f
Commit Graph

11337 Commits

Author SHA1 Message Date
Rushabh Mehta
73167eae60 [demo] make it faster, do not send user email 2017-06-16 16:55:32 +05:30
tundebabzy
9a3462031d [UX] Error in purchase transaction - Ignore instead of Prompt #7766 (#9329) 
* sets tax category to "Total" if all items are non-stock items

* makes notification message translatable and removes multi-line string

* Update buying_controller.py
 2017-06-16 15:30:14 +05:30
almeidapaulopt
31692a2595 Create a project from a Sales Order (#9111) 
* init commit

* don't get tasks if project name is none

* cleanup

* Update sales_order.js
 2017-06-16 15:29:41 +05:30
mbauskar
2ea55c7143 [minor] reload Domain doctype before executing patch 2017-06-16 14:33:59 +05:30
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
Sagar Vora
b1c794a4f9 [hot] fix global name args is not defined (#9326) 2017-06-16 13:50:35 +05:30
rohitwaghchaure
fb45913b3b [fix] Patch for move account head from account to warehouse (#9325) 2017-06-16 13:12:37 +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
Vishal Dhayagude
2510d1c86a Training Events/Results link added to Employee (#9313) 2017-06-16 11:58:08 +05:30
Umair Sayed
5dadb0e19a created help page for email inbox, fixes #9262 (#9315) 2017-06-16 11:57:44 +05:30
Britlog
224eb90199 Fix get_parents context (#9296) 2017-06-16 11:51:06 +05:30
Sagar Vora
5f407907a2 fix logic of quantity validation (#9311) 2017-06-16 11:43:36 +05:30
Manas Solanki
b07535bb64 bug in training result module (#9314) 2017-06-16 11:20:42 +05:30
Rushabh Mehta
c8a0de5e59 Revert "sets tax category to "Total" if all items are non-stock items (#9295)" (#9320) 
This reverts commit 476c4fec1d.
 2017-06-16 11:18:23 +05:30
tundebabzy
476c4fec1d sets tax category to "Total" if all items are non-stock items (#9295) 2017-06-16 11:17:40 +05:30
Ben Cornwell-Mott
840c757b12 Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom 2017-06-15 08:53:29 -07:00
Ben Cornwell-Mott
7055446508 Reload explosion and scrap items docs 2017-06-15 08:52:55 -07:00
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
mbauskar
489550ed59 bumped to version 8.0.50 2017-06-15 16:35:49 +06:00
Makarand Bauskar
a4af7cb7d3 removed extra quote from query 2017-06-15 16:02:44 +05:30
Nabin Hait
5aee7d1b70 Change column length of in_words 2017-06-15 15:35:08 +05:30
mbauskar
f9e2bf1ab4 fixed merge conflicts 2017-06-15 13:42:47 +05:30
mbauskar
39f4130a0a bumped to version 8.0.49 2017-06-15 13:59:40 +06:00
Nabin Hait
6e9a146f2b Merge pull request #9193 from tundebabzy/issue_9180 
Payment Entry - Latest Exchange Rate not fetched
 2017-06-15 12:34:27 +05:30
Makarand Bauskar
428e5b7172 Merge pull request #9299 from rohitwaghchaure/refernce_name_issue 
[fix] Payment Entry - draft sales invoices should not be selectable
 2017-06-15 12:32:00 +05:30
Nabin Hait
2153399c39 Create journal_entry.py 2017-06-15 12:30:58 +05:30
Rohit Waghchaure
5ea8c97b7c [fix] Payment Entry - draft sales invoices should not be selectable 2017-06-15 12:16:15 +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
rohitwaghchaure
03ba66d0d8 [Fix] In sales invoice, delivery note link not showing in the dashboard if delivery note has made from sales invoice (#9290) 2017-06-14 19:41:11 +05:30
Umair Sayed
0b8e19b5d8 Added new help pages as per OKR - DO NOT MERGE (#9291) 
* added help pages on Assessment, delete and restore documents and Document versioning, fixed #9262

* some fixes in help docs
 2017-06-14 19:40:08 +05:30
tunde
3514332cd8 changes journal_entry.get_exchange_rate to return exchange rate at date not average exchange rate 2017-06-14 13:14:40 +01:00
Manas Solanki
67c4f1713b Minor changes in the UX and courses automatically fetched upon saving (#9264) 2017-06-14 17:34:36 +05:30
Manas Solanki
95ca531def make quotation against lead company name (#9188) 2017-06-14 16:13:23 +05:30
tundebabzy
f5604c101c Once primary key is generated, do not allow changing Series #8911 (#9265) 
* changes set_only_once field for tabDocField to 1

* changes all affected doctypes `set_only_once` option to 1

* add patch name to text file

* adds test cases

* Revert "add patch name to text file"

This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.

* Revert "changes set_only_once field for tabDocField to 1"

This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
 2017-06-14 16:10:09 +05:30
Sagar Vora
847444724b remove bracket (#9284) 2017-06-14 15:51:47 +05:30
Sagar Vora
d19c2e2e93 [minor] Check if item is stock item before validating Warehouse while Purchase Return (#9282) 
* Check if item is stock item before validating Warehouse

* changed logic to decide warehouse_mandatory
 2017-06-14 15:39:41 +05:30
KanchanChauhan
c849f647f7 Show Stock Level only if any value(actual, reserved, reserved for production or projected) exists (#9168) 2017-06-14 15:37:47 +05:30
Manas Solanki
40be3f4048 fix in the item for the function make_variant_item_code (#9280) 2017-06-14 15:06:07 +05:30
Manas Solanki
737482423b change in the absent student report (#9185) 2017-06-14 15:05:48 +05:30
tundebabzy
5c9dd42547 fixes #9098: don't skip calculation if income or expense is [] (#9267) 2017-06-14 14:57:34 +05:30
rohitwaghchaure
4c0f9dac94 Total amount not showing for credit note column in the print (#9278) 2017-06-14 12:54:48 +05:30
Makarand Bauskar
0da5f23db6 [minor] fixed Cannot read property 'default_letter_head' of undefined (#9268) 2017-06-14 12:52:13 +05:30
Sagar Vora
99a2db80ab move bom based rate calculation to end (#9271) 2017-06-14 12:38:27 +05:30
rohitwaghchaure
1b2b4a626f [Fix] Accounts receivable report showing wrong currency for total amount against the customer (#9276) 2017-06-14 12:32:52 +05:30
bcornwellmott
d53dd7f4c9 Merge branch 'develop' into bom_convert_uom 2017-06-13 08:40:24 -07:00
Sagar Vora
489ab6d70d [minor] remove hardcoded flt precision and use system default (#9250) 
* possible fix

* use system default precision for flt
 2017-06-13 18:58:47 +05:30
tundebabzy
26a39610ca fixes #8941: Better error message for duplicate items (#8968) 
* fixes #8941: Better error message for duplicate items

* gathers all non unique items instead of first encountered non unique item

* renders errored items with `br` instead of `li`
 2017-06-13 17:40:56 +05:30
Ashwini Save
eed0cee186 Solve issue for while changing status of sales order page not reloading (#9204) 
* Solve issue for while changing status of sales order page not reloading

* Close Sales order issue : code review Changes.
 2017-06-13 17:14:06 +05:30
Makarand Bauskar
da15486624 Merge pull request #9260 from mbauskar/address-and-contacts 
[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)
 2017-06-13 17:08:56 +05:30
Makarand Bauskar
a7a7c835cc Merge pull request #9196 from msiddiq0/patch-2 
Fix incorrect youtube link on Video Tutorials
 2017-06-13 17:05:50 +05:30
Makarand Bauskar
f339f6d69f Merge pull request #9195 from msiddiq0/patch-1 
Fixed wrong YouTube video link
 2017-06-13 17:05:36 +05:30
Makarand Bauskar
65f5cf3fc1 Merge pull request #9197 from msiddiq0/patch-3 
Fix incorrect YouTube link on Video Tutorials
 2017-06-13 17:05:19 +05:30
mbauskar
96ce5821b8 [hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company) 2017-06-13 17:03:13 +05:30
Makarand Bauskar
0c5d732cd8 Merge pull request #9208 from mbauskar/docs 
removed {next} from documentation and removed the globals from custom scripts
 2017-06-13 16:32:26 +05:30
Makarand Bauskar
70ef313b0d Merge pull request #9245 from frappe-pr-bot/translations-2017-06-13 
[translation] translation update
 2017-06-13 16:23:22 +05:30
KanchanChauhan
1dc26b127b Salutation and Gender in Lead and Customer (#9199) 2017-06-13 15:26:35 +05:30
Saurabh
797f2030f8 Merge branch 'master' into develop 2017-06-13 15:20:13 +05:30
Saurabh
0b35a3a67a bumped to version 8.0.48 2017-06-13 15:50:13 +06:00
frappe-pr-bot
f7fe66cc48 [translation] translation updates 2017-06-13 11:17:57 +02:00
Makarand Bauskar
8ce53c94d1 Merge pull request #9189 from mbauskar/mysql-lockout 
[hotfix] fixes for mysql Lock wait timeout exceeded
 2017-06-13 14:41:42 +05:30
mbauskar
6f71648719 [minor] removed the else condition in update_qty 2017-06-13 14:36:30 +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
_JG_
aafe0c517f Update purchase_order_dashboard.py (#9149) 
There are no links to projects
 2017-06-13 13:00:47 +05:30
Makarand Bauskar
757e1bf846 Merge pull request #9213 from manassolanki/school-report 
fix for student monthly attendance report
 2017-06-13 12:30:37 +05:30
Ashwini Save
7f14f28099 Account Receivable - Credit Note column added to print format. (#9230) 
* Account Receivable - Credit Note column added to print Format.

* Review changes for translation: Account Receivable add credit note column

* Review changes for translation: Account Receivable add credit note column

* Review changes for translation: Account Receivable add credit note column
 2017-06-13 11:18:39 +05:30
Makarand Bauskar
88a0d22c10 Merge pull request #9214 from saurabh6790/stock_ledger_entry_indexing 
[fix] add index on voucher type and voucher no in stock ledger entry
 2017-06-12 17:26:24 +05:30
Nabin Hait
d0ac0bdc18 Merge branch 'master' into develop 2017-06-12 13:50:12 +05:30
Nabin Hait
d3e1afa2f5 bumped to version 8.0.47 2017-06-12 14:20:11 +06:00
Rohit Waghchaure
782d477be0 [fix] Due Date cannot be before Posting Date 2017-06-12 12:35:40 +05:30
Rushabh Mehta
4f8f9c1d9a [enhance] create demo with function bench --site sitename make-demo` (#9212) 2017-06-12 09:18:06 +05:30
Rohit Waghchaure
c8490626f9 [minor] added mobile no to search customer in POS 2017-06-10 12:21:37 +05:30
tunde
5127da952e changes expected payment_account in test case according to the fact that exchange rate should return latest saved rate 2017-06-09 17:11:41 +01:00
bcornwellmott
fed9816213 Removed trailing whitespace 2017-06-09 07:37:27 -07:00
bcornwellmott
a35839aa47 Removing unused pprint 2017-06-09 07:36:15 -07:00
Saurabh
0c21d85f0d [fix] add index on voucher type and voucher no in stock ledger entry 2017-06-09 19:05:30 +05:30
tunde
7bf4b121f3 Merge branch 'hotfix' into issue_9180 2017-06-09 13:58:22 +01:00
Manas Solanki
4458eb356b fix for student monthly attendance report 2017-06-09 18:20:21 +05:30
mbauskar
828804fab0 [minor] removed the {next} from the last articles 2017-06-09 17:30:36 +05:30
mbauskar
11f0ee3cac [docs] removed the globals from documentation 2017-06-09 17:23:06 +05:30
Faris Ansari
0626716f48 Merge pull request #9182 from pratu16x7/stock-entry-detail-global-fix 
[fix] sys_defaults global in stock entry detail
 2017-06-09 16:27:07 +05:30
rohitwaghchaure
97fd21a01d [Fix] Accounts receivable summary report not loading data because credit note column was missing (#9191) 
* [Fix] Accounts receivable summary report not loading data because credit note column was missing

* Create accounts_receivable_summary.py
 2017-06-09 14:05:10 +05:30
Makarand Bauskar
665311b38a [hotfix] replaced __ call with _ in project_timesheets.html (#9198) 2017-06-09 14:03:20 +05:30
tunde
0a5db528b1 makes sure latest test fixtures for currency exchange is retrieved before running test 2017-06-09 08:14:10 +01:00
msiddiq0
a05c168808 Fix incorrect YouTube link on Video Tutorials 
The original YouTube video is private and not viewable by anyone. I linked the publicly viewable YouTube video for "Report Builder" now.
 2017-06-08 21:02:45 -04:00
msiddiq0
a095d6e04b Fixing youtube link 
Wrong youtube video linked here: "Managing Advance Payments". Linked to correct video now: "Bulk Update"
 2017-06-08 20:51:50 -04:00
msiddiq0
03183332b4 Fixed wrong YouTube video link 
The original link here led to video on "Bulk Update" not "Budgeting". I went and found the Budgeting video and linked it here now.
 2017-06-08 20:10:18 -04:00
tunde
9b827e5b95 makes set_exchange_rate retrieve the latest exchange rate not average for "pay" and "internal transfer" payment entries 2017-06-08 20:54:01 +01:00
tunde
6148fe0909 adds test case to confirm that latest exchange rate is automatically selected 2017-06-08 20:50:11 +01:00
tunde
88f1d316d8 adds new tests that verify that get_exchange_rate returns the latest exchange rate 2017-06-08 19:44:26 +01:00
tunde
3eb5cb14d1 calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate 2017-06-08 14:23:49 +01:00
mbauskar
1042941348 [hotfix] fixes for mysql Lock wait timeout exceeded 2017-06-08 18:45:50 +05:30
pratu16x7
adb418d453 [fix] sys_defaults global in stock entry detail 2017-06-08 10:42:03 +05:30
Nabin Hait
2c808c578d Merge branch 'master' into develop 2017-06-08 10:34:45 +05:30
Nabin Hait
72f7a1a748 bumped to version 8.0.46 2017-06-08 11:04:44 +06:00
bcornwellmott
5491275b66 Merge branch 'develop' into bom_convert_uom 2017-06-07 08:42:54 -07:00
Javier Wong
b414f73931 [enhancement] Allow on Submit for Sales Order Customer PO and Customer PO Date (#9137) 2017-06-07 20:11:45 +05:30
ahmadRagheb
9017f3768b Fix labels to accept translation in selling doctype (#9135) 
"label": _("Customer Addresses And Contacts"),
"label": _("Sales Partner Addresses And Contacts"),
now they can accept to be translated
 2017-06-07 20:08:39 +05:30
Nabil Kadimi
41f6f4c200 Fix type (entrys) (#9131) 2017-06-07 20:08:11 +05:30
rohitwaghchaure
1607125815 [minor] POS customer creation was disabled in offline mode (#9169) 2017-06-07 20:06:58 +05:30
Umair Sayed
0dd5a20ca6 Help links added help_links.js (#9170) 
* help links in help_links.js

* fixed in help_links.js
 2017-06-07 20:05:35 +05:30
rohitwaghchaure
6b95210c19 [Fix] User not able to view projects from the portal (#9173) 2017-06-07 20:03:37 +05:30
Makarand Bauskar
59a1540898 [minor] removed the deprecated inList method from eval (#9177) 2017-06-07 20:02:09 +05:30
tundebabzy
98f8da1294 hides payments field when is_pos is checked (#9174) 2017-06-07 20:01:51 +05:30
tundebabzy
f3be8e0da6 removes check for condition - status == "Submitted" (#9176) 2017-06-07 19:59:33 +05:30
Nabin Hait
a128b21baa Fixed merge conflict 2017-06-07 12:17:17 +05:30
Nabin Hait
d0e530c63d bumped to version 8.0.45 2017-06-07 12:42:11 +06:00
Nabil Kadimi
347a79db5a Fix typo (#9133) 2017-06-07 12:06:05 +05:30
Frappe PR Bot
7c9010018d [translation] translation updates (#9156) 2017-06-07 12:05:29 +05:30
tundebabzy
f981eee221 fixes issue #9013: Salary calculation Error. (#9044) 
* fixes issue #9013:
Salary calculation Error.

* adds test case for scenario as in #9013
 2017-06-07 12:05:00 +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
Manas Solanki
ba7ed4626c fetch query for assessment group (#9120) 2017-06-07 11:57:11 +05:30
Nabin Hait
17378e8a29 Added a new column for Credit/Debit Note in AR/AP report (#9123) 2017-06-07 11:56:53 +05:30
Manas Solanki
b76b4f40a0 Added mode of transport in program enrollment (#9124) 2017-06-07 11:56:26 +05:30
Prateeksha Singh
3a18dea8a4 [fix][multiselect] don't show completed PRECs for a PINV (#9125) 2017-06-07 11:55:25 +05:30
Makarand Bauskar
db8363e9eb [minor] check serial no filedtype before updating (#9126) 
* Update serial_no.py

Takes care of Different FieldTypes

* [minor] check serial no filedtype before updating
 2017-06-07 11:54:26 +05:30
Manas Solanki
214e6906e5 Addition of field 'group based on' in the student attendance tool (#9152) 2017-06-07 11:53:41 +05:30
Manas Solanki
39adfb52f3 Naming in the assessment plan (#9153) 2017-06-07 11:52:36 +05:30
rohitwaghchaure
ce6e621c18 [fix] Not able to cancel the invoice if it's linked with the timesheet (#9157) 2017-06-07 11:52:04 +05:30
Manas Solanki
2a0d650735 fix in the report (#9167) 2017-06-07 11:29:27 +05:30
Faris Ansari
5f27c94100 Merge pull request #9078 from netchampfaris/remove-globals 
Lint and fix JS files
 2017-06-06 11:35:42 +05:30
Ben Cornwell-Mott
70fe968f02 Fixed some errors 2017-06-04 20:19:59 -07:00
Ben Cornwell-Mott
a3aa6a4449 Changed Explosion Item as well 2017-06-02 16:54:03 -07:00
Makarand Bauskar
c196d740e5 [minor] added filter for batch no field in purchase transaction (#9038) 
* [minor] added filter for batch no field in purchase transaction

* [minor] filter the batch based on item_code instead of get_batch_no method

* [minor] filter based on item_code for Purchase Invoice with update stock
 2017-06-02 17:28:40 +05:30
Nabin Hait
5b8b4dcce1 Merge branch 'master' into develop 2017-06-02 14:05:54 +05:30
Nabin Hait
52e443cfc8 bumped to version 8.0.44 2017-06-02 14:35:53 +06:00
Nabin Hait
ae07f22d8b Fixed syntax error 2017-06-02 13:57:16 +05:30
Nabin Hait
02d282f347 Merge branch 'master' into develop 2017-06-01 19:09:37 +05:30
Nabin Hait
1091a25491 bumped to version 8.0.43 2017-06-01 19:39:36 +06:00
Britlog
495a408db0 Fix contact form if email is both customer and lead (#9075) 2017-06-01 19:08:04 +05:30
Charles-Henri Decultot
5ade661a9a Weekly digest subject translation (#9003) 2017-06-01 19:06:32 +05:30
ahmadRagheb
c4d2bab5b3 Arabic language shows Errors onSubmit in maintenance_schedule (#9082) 
* Arabic language shows Errors onSubmit  in maintenance_schedule

when trying to submit using arabic language error show up , 
i replace this way of formating arguments 
				description = frappe._("Reference: %s, Item Code: %s and Customer: %s") % \
					(self.name, d.item_code, self.customer)
to new one  :description = frappe._("Reference: %s, Item Code: %s and Customer: %s").format(self.name, d.item_code, self.customer)

and it solve the problem on my local

* Arabic language shows Errors onSubmit in maintenance_schedule

* Arabic language shows Errors onSubmit in maintenance_schedule
 2017-06-01 19:06:00 +05:30
Frappe PR Bot
59ee45a1a5 [translation] translation updates (#9081) 2017-06-01 19:05:28 +05:30
Ashwini Save
2020dd37e8 Fixed issue : Payment Entry allocating amount more than invoice amount. (#9084) 
* Fixed issue : Payment Entry allocating amount more than invoice amount.

* Added condition to solve issue when allocated amount is null

* Code review Changes for payment entry
 2017-06-01 19:00:34 +05:30
Faris Ansari
9f6d024260 Set website route field as No Copy field (#9106) 
* Set website route field as No Copy field

* minor
 2017-06-01 18:58:07 +05:30
rohitwaghchaure
7f2513f7a1 [Fix] Employees working on a holiday report's date filter not working (#9108) 2017-06-01 18:57:34 +05:30
Manas Solanki
f60bd60012 Fix the demo for the schools (#8879) 
* Fix the demo for the schools

* Fix for the demo

https://github.com/frappe/erpnext/issues/6347
 2017-06-01 18:30:35 +05:30
Nabin Hait
e4b3a67e74 Rate validation in return entry 2017-06-01 16:47:45 +05:30
Manas Solanki
f02c82aeca Fixes in the patch (#9027) 
* fix in the patch

* new patch for student groups

* changes in the merge student batch patch
 2017-06-01 13:08:27 +05:30
tundebabzy
cf92be88b7 [minor] fixes typo (#9093) 2017-05-31 13:21:12 +05:30
Nabin Hait
fa16b849a0 Merge branch 'master' into develop 2017-05-30 22:52:39 +05:30
Nabin Hait
f2c374f524 bumped to version 8.0.42 2017-05-30 23:22:38 +06:00
mbauskar
26044f436a [minor] fixed a unexpected token error for opportunity 2017-05-30 22:28:08 +05:30
Nabin Hait
c9fa07b16d Merge branch 'master' into develop 2017-05-30 15:59:04 +05:30
Nabin Hait
93b5367485 bumped to version 8.0.41 2017-05-30 16:29:04 +06:00
Manas Solanki
5995010007 Correction in the validation message (#9079) 2017-05-30 15:56:48 +05:30
bcornwellmott
0d38a6b495 Fix grammar error in HR Training Results (#9076) 
* Fix Typo in message

Issue #9074

* Added  condition for notifying user of grade.
 2017-05-30 15:56:02 +05:30
Manas Solanki
a85b68ee77 link for timesheet, fix https://github.com/frappe/erpnext/issues/9042 (#9071) 2017-05-30 15:55:00 +05:30
Manas Solanki
ca31425bb4 field for the naming series should have no copy attribute (#9067) 2017-05-30 15:36:50 +05:30
Manas Solanki
253c53cf53 updating serial no status from scheduler #9061 (#9066) 2017-05-30 15:35:58 +05:30
Nabin Hait
ac3b2aa913 Set change amount automatically only if it is a cash transaction (#9065) 2017-05-30 15:35:01 +05:30
Nabin Hait
5d7e8d9e83 Minor fix in timesheet (#9063) 2017-05-30 15:34:35 +05:30
Nabin Hait
6a5cf672c1 Fixed opportunity status (#9062) 2017-05-30 15:34:20 +05:30
Manas Solanki
5f7b88d9c3 set student roll no in backend if not given (#9039) 2017-05-30 15:33:50 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
Faris Ansari
dae7721384 Merge pull request #8975 from almeidapaulopt/milestones 
Milestones in Project Gantt
 2017-05-29 10:58:35 +05:30
Nabin Hait
6a541a6f7a Merge branch 'master' into develop 2017-05-26 21:35:42 +05:30
Nabin Hait
38ada81487 bumped to version 8.0.40 2017-05-26 22:05:41 +06:00
Prateeksha Singh
e38c70c8bc [fix] uppercase filter frappe/erpnext#8996 (#9026) 2017-05-26 21:34:18 +05:30
Francisco Roldán
44c1a610a1 Financial Statements Button translateabled (#9032) 2017-05-26 21:32:51 +05:30
Makarand Bauskar
157c334737 [minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents (#9037) 2017-05-26 21:32:33 +05:30
Nabin Hait
4b12896941 Party Dashboard: Consider any random company if default company not set (#9046) 2017-05-26 21:25:36 +05:30
Sagar Vora
7b0c682635 [fix] add round off difference to last row in landed cost voucher (#8989) 
* [fix] add round off difference to last row in landed cost voucher

* Add test case for odd numbers

* Add assertEquals to verify applicable charges

* Use make_purchase_receipt, move round off logic

* Allow rounding difference

* Specify cost center to pass test
 2017-05-26 14:58:54 +05:30
Ashwini Save
d702cbfbfa Update code to fix issue #erpnext WN-SUP25349 : ValueError: max() arg is an empty sequence. (#9025) 2017-05-25 15:48:08 +05:30
Nabin Hait
45d337a016 Merge branch 'master' into develop 2017-05-25 14:19:51 +05:30
Nabin Hait
d7d9cd2938 bumped to version 8.0.39 2017-05-25 14:49:50 +06:00
Nabin Hait
7e7dc0f254 Update party.py 2017-05-25 14:18:20 +05:30
Ayush Shukla
e9cf1aba77 added float and rebase with hotfix (#9019) 2017-05-25 14:14:55 +05:30
Manas Solanki
c2bf50042f validate email id only if provided (#9020) 2017-05-25 14:14:42 +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
Nabin Hait
12ec71781d bumped to version 8.0.38 2017-05-24 19:08:33 +06:00
Makarand Bauskar
2f17e70793 [minor] removed the {next} for last page (#9002) 2017-05-24 18:35:35 +05:30
Manas Solanki
659a225f24 allow multiple items in purchase receipt (#8997) 2017-05-24 17:49:52 +05:30
Ishan Loya
9bf4563b7a Change modified time 2017-05-24 17:47:42 +05:30
Ishan Loya
a70b41fbb8 Remove Role 'All' from BOM 2017-05-24 17:47:42 +05:30
CH
d0ebd7f7c2 POS translatable fields correction 2017-05-24 17:45:46 +05:30
Nabin Hait
adfe84b04f Revert "Website Specification Labls should not be capitalised by default (#8798)" 
This reverts commit 331566d612.
 2017-05-24 17:33:07 +05:30
Nabin Hait
7916590528 Revert "Update lead.py (#8789)" 
This reverts commit 9283377f87.
 2017-05-24 17:33:07 +05:30
Nabin Hait
fdce7a0dc3 Revert "link the different doctype in the school module (#8844)" 
This reverts commit c320537e4c.
 2017-05-24 17:33:07 +05:30
Nabin Hait
b3d4326dcc Revert "Prompt for mandatory batch number in POS (#8928)" 
This reverts commit ce9ac7885e.
 2017-05-24 17:33:07 +05:30
Nabin Hait
54fcf85317 Revert "Documentation for Allow Login using Mobile Number (#8918)" 
This reverts commit 818ad397c8.
 2017-05-24 17:33:07 +05:30
Nabin Hait
689da20e7b Revert "View Attachments in portal (#8830)" 
This reverts commit 7e661437b1.
 2017-05-24 17:33:07 +05:30
Nabin Hait
eb92d907bc Revert "Added flt to convert string to float" 
This reverts commit bf4915b285.
 2017-05-24 17:33:07 +05:30
Nabin Hait
0cd792ebb2 Revert "Update taxes_and_totals.py" 
This reverts commit e4afab7fb0.
 2017-05-24 17:33:07 +05:30
Rushabh Mehta
e4afab7fb0 Update taxes_and_totals.py 2017-05-24 17:29:23 +05:30
Ayush AS
bf4915b285 Added flt to convert string to float 2017-05-24 17:29:23 +05:30
Charles-Henri Decultot
7e661437b1 View Attachments in portal (#8830) 
* View Attachments in portal

* HTML beautify correction

* Move option to shopping cart settings

* new field in shopping cart settings for public attachments display in portal
 2017-05-24 17:29:23 +05:30
Gaurav Naik
818ad397c8 Documentation for Allow Login using Mobile Number (#8918) 2017-05-24 17:29:23 +05:30
Charles-Henri Decultot
ce9ac7885e Prompt for mandatory batch number in POS (#8928) 
* Prompt for mandatory batch number in POS

* Whitespaces correction
 2017-05-24 17:29:23 +05:30
Manas Solanki
c320537e4c link the different doctype in the school module (#8844) 2017-05-24 17:29:23 +05:30
Abdulla P I
9283377f87 Update lead.py (#8789) 
* Update lead.py

Import datetime to compare next contact date with now()

* Update lead.py

* Update lead.py

As per the suggestion from Nabin,instead of Datetime,getdate and nowdate from frappe.utils imported
 2017-05-24 17:29:23 +05:30
KanchanChauhan
331566d612 Website Specification Labls should not be capitalised by default (#8798) 2017-05-24 17:29:23 +05:30
nick9822
ca150cee8c Minor change: Alert to msgprint (#8966) 
* Minor change: Alert to msgprint

* msgprint to frappe.msgprint
 2017-05-24 17:22:26 +05:30
mbauskar
ff70f38eac [minor] patch to delete the schools deprecated doctypes 2017-05-24 17:13:16 +05:30
mbauskar
d1552f97e4 [minor] moved a comment in item.js 2017-05-24 17:13:16 +05:30
mbauskar
baa4afd67b [minor] removed the Grade Interval and Grading Structure doctype 2017-05-24 17:13:16 +05:30
Nabin Hait
2f0c34385b Check if doctype exists before renaming 2017-05-24 17:12:07 +05:30
Nabin Hait
258f7da778 Paid amount + Write Off Amount can not be greater than Grand Total in return POS 2017-05-24 17:12:07 +05:30
Nabin Hait
799a9cabe7 Can't change valuation method in stock settings, if there are transactions against some items which does not have it's own valuation method 2017-05-24 17:11:48 +05:30
Nabin Hait
24f0b13b22 Total unpaid amount in party is based on GLE 2017-05-24 16:46:56 +05:30
Nabin Hait
2d79a641c2 Annual billing amount in party dashboard based on grand total 2017-05-24 16:46:56 +05:30
Charles-Henri Decultot
032374e76e Correction of the digest template (#8992) 2017-05-24 16:29:42 +05:30
Nabin Hait
7a9bd41a72 Improved currency exchange rate message 2017-05-24 16:18:36 +05:30
Nabin Hait
8fac45a885 Merge branch 'master' into develop 2017-05-24 09:07:26 +05:30
Nabin Hait
88906cfc63 bumped to version 8.0.37 2017-05-24 09:37:26 +06:00
Nabin Hait
e72c98dafb On change of item rate, set margin amount on price list rate, instead of margin percentage (#8988) 2017-05-24 09:01:44 +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
dce8dfc4fe Merge branch 'master' into develop 2017-05-23 17:48:43 +05:30
Nabin Hait
c8a25b6dac bumped to version 8.0.36 2017-05-23 18:18:42 +06:00
Makarand Bauskar
724cc35421 [minor] added columns to pos print_template (#8978) 2017-05-23 17:43:42 +05:30
Nabin Hait
c9f5d84742 Merge branch 'master' into develop 2017-05-23 17:16:19 +05:30
Nabin Hait
8854f8bd50 bumped to version 8.0.35 2017-05-23 17:46:19 +06:00
Manas Solanki
fe05645051 fix issue when image not saved after attaching (#8957) 2017-05-23 17:13:26 +05:30
Faris Ansari
29d64cae34 POS print format fix (#8973) 2017-05-23 17:12:51 +05:30
Paulo Almeida
97ff6fea47 add milestone field 2017-05-23 11:55:37 +01:00
Nabin Hait
889e456dab Merge branch 'master' into develop 2017-05-23 12:04:06 +05:30
Nabin Hait
2ef20a968c bumped to version 8.0.34 2017-05-23 12:34:05 +06:00
Nabin Hait
fdc7d7f3de Check for active quotations before declaring it as lost (#8969) 2017-05-23 12:02:34 +05:30
Manas Solanki
a68fff470c minor fix in student group (#8959) 2017-05-23 11:39:53 +05:30
Manas Solanki
552f7ab678 fix in the patch for merging the student batch and student group (#8961) 2017-05-23 11:38:57 +05:30
Faris Ansari
2424aa73d7 Fix translated string in jinja (#8956) 2017-05-22 13:09:36 +05:30
Rushabh Mehta
2b06633919 Merge branch 'master' into develop 2017-05-19 19:24:43 +05:30
Rushabh Mehta
f3a318921f bumped to version 8.0.33 2017-05-19 19:54:42 +06:00
rohitwaghchaure
529f5ce503 [fix] Not able to change the status as Lost in opportunity (#8938) 2017-05-19 18:56:54 +05:30
rohitwaghchaure
177a26849d [fix] Trial balance not working (#8937) 2017-05-19 18:56:25 +05:30
Rushabh Mehta
612b31b626 Merge branch 'master' into develop 2017-05-19 18:33:55 +05:30
Rushabh Mehta
d2484ece24 bumped to version 8.0.32 2017-05-19 19:03:54 +06:00
Rushabh Mehta
04ea4910f0 [rename] zh-tw -> zh-TW 2017-05-19 18:27:53 +05:30
Rushabh Mehta
03fb6ff003 [rename] zh-tw -> zh-TW 2017-05-19 18:26:49 +05:30
Charles-Henri Decultot
2de1cd3529 View Attachments in portal (#8830) 
* View Attachments in portal

* HTML beautify correction

* Move option to shopping cart settings

* new field in shopping cart settings for public attachments display in portal
 2017-05-19 16:04:10 +05:30
Gaurav Naik
7f02714c26 Documentation for Allow Login using Mobile Number (#8918) 2017-05-19 16:03:05 +05:30
Charles-Henri Decultot
8bec0239b9 Prompt for mandatory batch number in POS (#8928) 
* Prompt for mandatory batch number in POS

* Whitespaces correction
 2017-05-19 16:02:30 +05:30
Manas Solanki
56549fd3d9 link the different doctype in the school module (#8844) 2017-05-19 15:16:50 +05:30
Abdulla P I
6cbc9b03f9 Update lead.py (#8789) 
* Update lead.py

Import datetime to compare next contact date with now()

* Update lead.py

* Update lead.py

As per the suggestion from Nabin,instead of Datetime,getdate and nowdate from frappe.utils imported
 2017-05-19 15:15:36 +05:30
KanchanChauhan
32cbbe5cc2 Website Specification Labls should not be capitalised by default (#8798) 2017-05-19 15:14:31 +05:30
Rushabh Mehta
65a27395fe [minor] remove student batch name from activation.py 2017-05-19 14:53:32 +05:30
Nabin Hait
4d2d996782 bumped to version 8.0.31 2017-05-19 14:42:28 +06:00
Nabin Hait
47afc55939 Merge branch 'master' of github.com:frappe/erpnext into hotfix 2017-05-19 14:10:53 +05:30
Nabin Hait
0096240a65 bumped to version 8.0.30 2017-05-19 14:38:59 +06:00
Makarand Bauskar
864f134610 [minor] removed the da-DK.csv translations (#8930) 2017-05-19 14:04:52 +05:30
Rohit Waghchaure
8a1c58c3c3 [fix] _ is not defined while accessing the POS 2017-05-19 13:01:32 +05:30
Ayush Shukla
ae696d005a Changed report_hide=0 for reference_name (#8902) 2017-05-19 12:38:08 +05:30
Prateeksha Singh
89cec18467 set variant name based on template name (frappe/erpnext#6367) (#8920) 2017-05-19 12:35:36 +05:30
Rushabh Mehta
4bcc2316a9 Don't update variant when template is updated (#8922) 
* [fix] allow editing of variant properties, reverting earlier fix

* [minor] dont automatically update variants when the template is saved
 2017-05-19 12:33:00 +05:30
Nabin Hait
012c9a0916 Set default account in mode-of-payment Cash, only if default cash account exists (#8909) 2017-05-19 12:30:58 +05:30
Frappe PR Bot
c080479f1f [translation] translation updates (#8927) 2017-05-19 12:30:04 +05:30