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

18770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
89f7dd3c98 Merge branch 'hotfix' 2017-06-08 10:34:45 +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
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
d428ec1a9e Merge branch 'hotfix' 2017-06-07 12:12:11 +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
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
5f98dddd0c Merge branch 'hotfix' 2017-06-02 14:05:53 +05:30