Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,134 Commits 3 Branches 0 Tags 1 GiB
c3b4464df8
Commit Graph

14141 Commits

Author SHA1 Message Date
Nabin Hait
00279f27f3 bumped to version 10.1.15 2018-03-27 14:52:27 +06:00
Nabin Hait
f620dae8ca Null issue fixed in gstr reports 2018-03-27 14:15:36 +05:30
Nabin Hait
9d7fe1f7cd Indicator fix for stock entry item table 2018-03-27 13:30:11 +05:30
Prateeksha Singh
ffaed1ce2e
Merge pull request #13404 from pratu16x7/variants 
Enumerate numeric values in variant dialog
 2018-03-27 12:18:13 +05:30
Prateeksha Singh
be368fe94b Enumerate numeric values in variant dialog 2018-03-27 12:17:15 +05:30
Shreya Shah
ba4f32be5c set default warehouse instead of product bundle's warehouse for packed_items in delivery note (#13398) 2018-03-27 11:32:10 +05:30
rohitwaghchaure
85f63a3866 [Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392) 2018-03-27 11:31:44 +05:30
Shreya Shah
149f7ee875 [Fix] General Ledger Report (#13374) 
* error fix if party_type = student or shareholder

* clear party filter when party_type changes to avoid error throw

* dict with values of party_name in utils.js

* fetch party_name from erpnext.utils.get_party_name

* Update general_ledger.py
 2018-03-27 11:29:25 +05:30
rohitwaghchaure
c9a1eb1081 [Fix] Not able to delete row in modal table (#13377) 2018-03-27 11:26:43 +05:30
rohitwaghchaure
2e560cb25d [Fix] Same serial no returned two times (#13378) 2018-03-27 11:24:50 +05:30
Nabin Hait
651b612909
Fixed logic for reserved qty for subcontract and production and written a patch (#13396) 
* Fixed logic for reserved qty for subcontract and production and written a patch

* repost reserved qty for filtered bins
 2018-03-27 11:24:20 +05:30
Manas Solanki
398eac3f4c message in the program enrollment tool (#13393) 2018-03-27 11:21:47 +05:30
Frappe PR Bot
7db805a031 [Translation] Updated Translations (#13394) 2018-03-27 11:21:08 +05:30
Shreya Shah
f3025f1596 operation time in grid view (#13400) 2018-03-27 10:34:05 +05:30
Prateeksha Singh
e45f957ad9
Merge pull request #13363 from shreyashah115/timer 
Timer in Timesheets!
 2018-03-27 10:28:50 +05:30
Nabin Hait
061d912749 Fixed merge conflict 2018-03-23 16:20:27 +05:30
Nabin Hait
3fdda7a9b7 bumped to version 10.1.14 2018-03-23 16:35:06 +06:00
Shreya Shah
9bcadf8126 Tax Id in some reports and print formats (#13373) 
* tax-id in sales and purchase registers

* tax-id in general ledger print_format

* tax-id in accounts payable

* tax-id in accounts receivable
 2018-03-23 15:04:37 +05:30
rohitwaghchaure
492de67d7b Added consumed material cost in project (#13365) 2018-03-23 15:02:04 +05:30
Nabin Hait
80a9f523d5 Minor fix AR/AP summary report 2018-03-23 13:02:27 +05:30
Shreya
8bb0f05451 added task field 2018-03-23 11:46:45 +05:30
Shreya
7619cd2e14 updated docs for timesheet 2018-03-23 11:41:56 +05:30
Shreya
822ba21f38 codacy fix 2018-03-23 11:41:56 +05:30
Shreya
559011404a removed timesheet.html, appended it as a helper function 2018-03-23 11:41:56 +05:30
Shreya
5bf24be704 minor fixes 2018-03-23 11:41:56 +05:30
Shreya
8f06266838 all fields editable 2018-03-23 11:41:55 +05:30
Shreya
5714260af4 replaced status with completed checkbox 2018-03-23 11:41:55 +05:30
Shreya
09937f3753 modified timer start button 2018-03-23 11:41:55 +05:30
Shreya
faff9d3bb2 thanks to faris for the css 2018-03-23 11:41:55 +05:30
Shreya
68ec22a90c moved timer.js to public/js 2018-03-23 11:41:55 +05:30
Shreya
05e516efc4 Start the timer on the basis of time diff between now_time and timestamp 2018-03-23 11:41:55 +05:30
Shreya
7cc288a6db New activity dialog removed, read only fields editable if no rows found, add a new row on timer start 2018-03-23 11:41:55 +05:30
Shreya
36040ce5f9 new field actual_end_time to record completed time 2018-03-23 11:41:55 +05:30
Shreya
dcce87d4a8 CSS modifications 2018-03-23 11:41:55 +05:30
Shreya
cd140da3ec new dialog to create activity 2018-03-23 11:41:55 +05:30
Shreya
643528a3b8 added status field 2018-03-23 11:41:55 +05:30
Shreya
8f4e93f104 removed stop button and added a complete button 2018-03-23 11:41:55 +05:30
Shreya
eeaba29e5b read only fields project and hours 2018-03-23 11:41:55 +05:30
Shreya
6a1bf70627 alert sound when timer exceeds the given hours 2018-03-23 11:41:55 +05:30
Shreya
1cfd28d50d timer in timesheet 2018-03-23 11:41:55 +05:30
Faris Ansari
35397a1033
Salary Register (#13367) 
- convert date range to from_date and to_date
 2018-03-22 15:26:45 +05:30
Nabin Hait
e3f0412570 Pass doc while autonaming item 2018-03-22 12:13:21 +05:30
rohitwaghchaure
6a2d073fe1
Merge pull request #13353 from PawanMeh/fixes_13352 
Add total qty to offline POS
 2018-03-22 11:36:32 +05:30
rohitwaghchaure
23fa8893a8 [Fix] Division by zero issue (#13362) 2018-03-22 11:16:00 +05:30
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports (#13344) 2018-03-22 11:12:02 +05:30
Manas Solanki
0f6c35d63f
Update update_project_in_sle.py 2018-03-21 18:24:45 +05:30
Faris Ansari
4fc74333bd Fix Icons for Expense Claim and Timesheet (#13359) 2018-03-21 17:54:09 +05:30
Kenneth Sequeira
6a92cdc358 Update cost-center.md (#13354) 
Fixed link to missing image for cost centre.
 2018-03-21 17:52:52 +05:30
rohitwaghchaure
93779c21a7 [Fix] Project not set in the stock ledger entry (#13357) 2018-03-21 17:52:41 +05:30
Manas Solanki
e010ddf65f Student Report Card (#13346) 
* finalise the assessment report

* minor fixes for button

* fix the travis and codacy
 2018-03-21 17:50:42 +05:30
Zarrar
969c8aaf52 [Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198) 
* customer code can be assigned based on customer group

* improvise customer group selection

* requested changes made
 2018-03-21 11:17:49 +05:30
Manas Solanki
c711445b91 add the student as party type (#13348) 2018-03-21 10:12:27 +05:30
rohitwaghchaure
2b88ac948e [Fix] Special character issue (#13350) 2018-03-21 10:04:47 +05:30
pawan
53a4d2c430 [fix] #13352 2018-03-21 09:19:36 +05:30
Faris Ansari
ce08aabc84 Add Kanban Board button in project (#13345) 2018-03-20 19:03:32 +05:30
Zlash65
0859018c48 unindented code 2018-03-20 16:29:27 +05:30
Siddhi Sawant
c672530210 [hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats (#13316) 
* Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats

* Update gst_pos_invoice.json

Updated its 'disabled' property.

* Update pos_invoice.json

Updated its 'disabled' property.

* Shows change amount only if it exists

* Updated disable property of print formats
 2018-03-20 14:31:14 +05:30
Britlog
e3a9b9fe49 [Website] Price in items list and sales uom management (#13335) 
* Price in items list and sales uom management

* Price in product search page

* Display website stock in sales uom

* Add set_product_info_for_website to avoid duplicate code

* Add price uom in item list and page

* Update product.py
 2018-03-20 14:28:44 +05:30
Zarrar
9a01baac1d explicitely provide order_by (#13338) 2018-03-20 14:08:44 +05:30
Achilles Rasquinha
0575b3e1c3 fixed inconsistent tab error (#13339) 2018-03-20 14:07:25 +05:30
Charles-Henri Decultot
d0ac69704f Chained log report doc (#13314) 2018-03-20 13:12:28 +05:30
Zarrar
c5b061834b doctype dropdown rectify, validate series is set (#13305) 2018-03-20 13:06:18 +05:30
Zarrar
13ddc7e188 [ Enhance ] Production to Work Order (#12902) 
* remove occurrences of Production Order

* rename from report and jsons

* Change Production Order to Work Order

* change occurences of production order from other files

* resolve minor conflict issues and reports

* patch added

* codacy fix

* updated patches, leftover changes

* rename reports, rectify patches
 2018-03-20 12:38:43 +05:30
Doridel Cahanap
c893268dea Add Health Insurance Doctype and link to Employee (#13257) 2018-03-20 12:37:02 +05:30
Deepak kumar
656ff36c76 [Feature] Advance Account Balance in Employee Advance (#13263) 
* added due advance amount field to show due amount

* fixes codacy

* made whitelisted method

* Update employee_advance.js
 2018-03-20 12:35:02 +05:30
Nabin Hait
d97c5a04b2 minor fix in item naming 2018-03-20 12:31:05 +05:30
Tom Price
cd525299ee [Feature] Add default duration and color to appointment type (#13296) 
* Add default duration and color to appointment type

When creating a Patient Appointment, the Duration field will be populated when the Appointment Type is set. This is preserved when checking availability and booking an appointment.
`Appointment Type.color` is used in the calendar display.

* Remove accidental fixed date from git

* Update modified timestamp to ensure migrations.

Set to the timestamp of dd506a0961437540872c01d3487b8e37806c0bb0
 2018-03-20 12:08:44 +05:30
Mark Walker
f572522f25 Copy source project into Purchase Order Item (#13321) 2018-03-20 12:06:04 +05:30
renzodemie
417dfed214 Daily Reminder (#12938) 
* for email sending

* test commit for new branch

* Removed test changes

* test commit renzo

* Email sending

* Project Uo

* Project Update

* "My first commit"

* "My second commit"

* "My second commit"

* Holiday is included

* delete idea

* first pull

* first pull

* "My third commit"

* Delete idea

* delete again

* "Edit Time"

* "Edit Time"

* Naming series and bug fixing

* "Edit current day and time"

* "Proper naming series, hidden time and date"

* Project and Project Update dashboard

* dashboard

* Remove hooks for PR

* Remove hooks for PR

* Remove hooks for PR

* Deleted project_time.py

* Corrected indention

* Hook back to original

* Delete project_time.py

* "Modified time"

* Fix indention

* Sample

* FRM

* FRM

* Time fix

* Hooks original state

* "Modified time"

* Added permission to Project User

* Added function/method to be called in order to create project update for the specific project

* Naming series

* this is not included

* Fix minor bug

* Indent again

* "Reformat Code"

* "Check Indent"

* Indent again and again

* semi colon

* "Check Again Indent"

* "Check again Indent"

* "Check again Indent"

* ind

* "Check again Indent"

* "Check again Indent"

* Generate Project update
With button in email

* []

* "Erro Summary"

* "Add syntax for the communcation"

* "add summary code"

* "Modified Summary code"

* "Modified Summary code"

* "Fix update ID and set localhost"

* Fix time and date error in project_update
Fix naming series problem in project_update

* included "not updated" in project update

* Bug in Number of Drafts

* "add notes in summary"

* Correct code

* With error

* Removed the method

* Minor fixes

* Correction for daily summary
 2018-03-20 11:58:15 +05:30
Nabin Hait
8a8966ce9b minor fix 2018-03-20 11:19:57 +05:30
Achilles Rasquinha
ecc4fdd3ef Check Set Sales Target Item exists in User Slides 2018-03-19 22:21:45 +05:30
Achilles Rasquinha
d0786b45c3 fix issue 2018-03-19 22:17:37 +05:30
Achilles Rasquinha
60da37b502
Merge pull request #13329 from shreyashah115/travis-fix 
[Fix] Travis
 2018-03-19 19:10:21 +05:30
Saurabh
2777fd4332 [fix] validate minimum transaction amount in Payment Request for selected payment gateway (#13328) 2018-03-19 18:29:01 +05:30
Shreya
9602bf4ba3 patch fix 2018-03-19 18:17:54 +05:30
Shreya
5042dd32da undefined args error 2018-03-19 17:45:39 +05:30
Shreya
4d347b1ca0 travis fix 2018-03-19 17:31:19 +05:30
Achilles Rasquinha
034834d671
Merge pull request #13326 from shreyashah115/fix-travis 
[Fix] Travis
 2018-03-19 17:00:34 +05:30
Shreya
f7b39438d2 travis fix 2018-03-19 14:19:55 +05:30
Achilles Rasquinha
3099ea67a1
Merge pull request #13303 from achillesrasquinha/py3 
unordered types None vs int
 2018-03-19 11:54:24 +05:30
Achilles Rasquinha
3d85951c1f
Merge pull request #13304 from achillesrasquinha/hotfix-hub 
[HOTFIX] Hub Domain Change
 2018-03-19 11:54:13 +05:30
Achilles Rasquinha
1e95323679 Fixed dict_keys concatenation 2018-03-18 10:08:43 +05:30
Manas Solanki
7b91042ae6
Merge pull request #13310 from manassolanki/student-report-card 
addition of student report card generation tool
 2018-03-16 02:00:07 +05:30
Manas Solanki
633a39144d addition of student report card generation tool 2018-03-16 01:57:45 +05:30
Achilles Rasquinha
94b41ea4f6 removed debugging 2018-03-15 12:53:22 +05:30
Achilles Rasquinha
d8f7de9946 fixed patch for hub 2018-03-15 12:48:32 +05:30
Nabin Hait
c8cd4ba6f7 Merge branch 'master' into develop 2018-03-15 12:38:43 +05:30
Nabin Hait
60200eaf0d bumped to version 10.1.13 2018-03-15 13:08:41 +06:00
Nabin Hait
1e4cfb4bf5 Fixes in setting po nos manually in sales invoice 2018-03-15 12:27:24 +05:30
Nabin Hait
70abac0061 Get territory from sales invoice 2018-03-15 12:19:16 +05:30
Achilles Rasquinha
a4a62d5ea1 unordered types None vs int 2018-03-15 12:18:37 +05:30
Nabin Hait
bb5caf8fad Merge branch 'master' into develop 2018-03-14 13:33:38 +05:30
Nabin Hait
6c09297bcd bumped to version 10.1.12 2018-03-14 14:03:36 +06:00
Nabin Hait
363cedde76 Fixed minor issue 2018-03-14 13:32:14 +05:30
Nabin Hait
d21ad807b5 Merge branch 'master' into develop 2018-03-13 18:13:44 +05:30
Nabin Hait
c8c733bc54 bumped to version 10.1.11 2018-03-13 18:43:42 +06:00
Shreya Shah
7acc8cb747 fix else condition (#13295) 2018-03-13 18:12:19 +05:30
Nabin Hait
e01dcc170c Merge branch 'master' into develop 2018-03-13 17:11:52 +05:30
Nabin Hait
56882033bf bumped to version 10.1.10 2018-03-13 17:41:49 +06:00
Nabin Hait
74c817e7f9
Update update_reserved_qty_for_purchase_order.py 2018-03-13 17:10:14 +05:30
Nabin Hait
3707242770 Fixed merge conflict 2018-03-13 16:15:41 +05:30
Nabin Hait
baac05955b bumped to version 10.1.9 2018-03-13 16:44:02 +06:00
Nabin Hait
89346967da
Reverted #13259 (#13291) 2018-03-13 16:01:11 +05:30
Nabin Hait
97e890d0b3
Fix in unallocated amount calc in payment entry (#13288) 2018-03-13 15:57:34 +05:30
Ameya Shenoy
95763bc233 Purchase Order fixes (#13287) 
- Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied'
- Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.
 2018-03-13 15:51:56 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI (#13290) 2018-03-13 15:46:59 +05:30
Ranjith Kurungadam
369ba85499 Physician Schedule fixes (#13284) 
* move button add schedule to grid

* Physician Schedule- add slots for multiple days

* fix patient image view
 2018-03-13 14:50:24 +05:30
Achilles Rasquinha
cbfcb3e61d string_types from basestirng 2018-03-12 19:15:29 +05:30
Zarrar
0702f29860 Add Ends-On field in the Lead doctype (#13147) 
* add ends_on date in lead to be mapped with calendar event

* set default ends_on to 1 hour from contact_time
 2018-03-12 18:49:54 +05:30
tundebabzy
0125f7b130 rename to Subscription and transfer present Subscription records to Auto Repeat in frappe 2018-03-12 13:51:47 +01:00
rohitwaghchaure
13460f023d [Fix] Batch value showing as item value while making batch (#13281) 2018-03-12 17:20:50 +05:30
Nabin Hait
2f493731ec Fixed merge conflict 2018-03-12 15:49:59 +05:30
Nabin Hait
04f50be306 bumped to version 10.1.8 2018-03-12 16:01:03 +06:00
Ameya Shenoy
b34ab7549a fixed subject to task_name (#13278) 2018-03-12 15:24:01 +05:30
Shreya Shah
aa54d934b8 make stock qty negative (#13276) 2018-03-12 15:23:28 +05:30
Zarrar
c35665fa60 update physician patch fail (#13277) 2018-03-12 15:21:53 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting (#13195) 
* [fix] #8427

* review comments changes

* Validation for reserved warhouse

* code improvements

* alignment

* test case

* message changes

* default warehouse / remove validation / change sql

* fix

* patch

* Fixed merge conflict

* Fixes and cleanups of reserve qty for subcontracting

* set from_warehouse only if purchase_order and purpose found (#12398)

* [HotFix] Validation issue for subcontract stock entry (#12127)

* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py

* Fixes and cleanups of reserve qty for subcontracting

* patch fixed

* Reload bin in patch

* [fix] set source warehouse in stock entry for manufacture

* [fix] #8540

* code alignment

* code alignment

* Move target warehouse validation to submit

* validation code improvement

* code changes for single stock entry

* validation fix

* call make_rm_stock_entry

* remove old stock entry method/rewrite test case

* Don't set bom_no against raw materials while trasferring items for sub-contracting

* minor fix
 2018-03-12 14:12:12 +05:30
Shreya Shah
58797481f0 uncheck report hide (#13256) 2018-03-12 13:08:01 +05:30
Kenneth Sequeira
b48557fdc6 payment terms video tutorial in videos/learn (#13258) 
* payment terms video tutorial in videos/learn

* Update payment-terms.md
 2018-03-12 13:07:21 +05:30
Shreya Shah
ef4c3b8e2f add has variants in standard filter (#13251) 2018-03-12 11:20:49 +05:30
rohitwaghchaure
12aa4265ff Don't allow to set negative quantity if transaction is not return entry (#13255) 2018-03-12 11:20:30 +05:30
Shreya Shah
69d9f51dbb if price list not found, set default selling/ buying price list from settings (#13259) 2018-03-12 11:15:49 +05:30
Prateeksha Singh
9362cf37e0 [charts] update charts API 2018-03-12 09:54:56 +05:30
tundebabzy
2970630ed2 Merge branch 'develop' into new-subscription 2018-03-12 02:00:34 +01:00
Nabin Hait
fd75d554d2 Payment Terms Template added in test_ignore for Company 2018-03-09 18:52:14 +05:30
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
Nabin Hait
096d136460 bumped to version 10.1.7 2018-03-09 17:08:50 +06:00
Nabin Hait
c3889d85a1
Update shopping_cart.js 2018-03-09 16:28:25 +05:30
Achilles Rasquinha
138a4850fe
Merge pull request #13252 from achillesrasquinha/py3 
sort by name accounts for trial balance.
 2018-03-09 15:23:28 +05:30
Achilles Rasquinha
dc61c6b975 sort by name accounts 2018-03-09 15:23:08 +05:30
Achilles Rasquinha
1d7665fca1 sort by name accounts 2018-03-09 15:22:20 +05:30
Nabin Hait
052333ea63 subctracting stock entry should also be considered as consumed qty 2018-03-09 14:30:32 +05:30
tundebabzy
3d26003c1f add column breaks to Subscription 2018-03-09 09:37:06 +01:00
tundebabzy
8889b70ba1 Merge branch 'develop' into new-subscription 2018-03-09 09:10:48 +01:00
Nabin Hait
0357fbc9c1 commonfied regional function for checking delete permission 2018-03-09 13:19:52 +05:30
Nabin Hait
096c05ca6f Fixes for regional feature of Nepal 2018-03-09 13:11:00 +05:30
theopen-institute
38cbd71352 prevent deletion of sales invoices if country is nepal 2018-03-09 12:39:40 +05:30
Achilles Rasquinha
b4de7e3d07 removed has_key, used pythonic in (#13236) 
* removed has_key, used pythonic in

* Update bom.py
 2018-03-09 12:35:47 +05:30
Suraj Shetty
f2d28ebd6a Data import Tool bug fix (#13165) 
* fixes #13064

* commonified naming series checks

* test fixes
replaced test employee names according to naming series
 2018-03-09 12:33:13 +05:30
tundebabzy
e69747ca6d [Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243) 
* add mode of payment field to Payment Term

* add mode of payment field to Payment Terms Template Detail

* add mode of payment field to Payment Schedule

* add mode of payment in `get_payment_term_details`
 2018-03-09 12:23:53 +05:30
Shreya Shah
aadd30d194 fetch delivery date on add-row only if item_code exists (#13250) 2018-03-09 12:19:35 +05:30
Zarrar
3fd634783d [Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198) 
* customer code can be assigned based on customer group

* improvise customer group selection

* requested changes made
 2018-03-09 12:10:45 +05:30
Harsh Patel
22e6f8d4c2 Fixes for #13071 (#13234) 2018-03-08 16:23:59 +05:30
rohitwaghchaure
acd3479269 Bank POS transactions in bank reconciliation (#13225) 2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82 [Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233) 2018-03-08 16:21:13 +05:30
Ranjith Kurungadam
a3a63177a1 fix- cannot cancel consultation, remove updating age (#13226) 2018-03-08 16:20:22 +05:30
Achilles Rasquinha
b2f7092f9e
Merge pull request #13235 from achillesrasquinha/py3 
removed has_key
 2018-03-08 14:22:36 +05:30
Achilles Rasquinha
87dab14576 removed has_key 2018-03-08 14:21:48 +05:30
Ameya Shenoy
d2eec91b2c
indentation fix 2018-03-08 13:27:11 +05:30
Achilles Rasquinha
9efd6e80d2 fixed tabs 2018-03-08 13:20:48 +05:30
Achilles Rasquinha
987934d8ee fixed tabs 2018-03-08 13:16:08 +05:30
Achilles Rasquinha
abd365fd90
Merge pull request #13228 from achillesrasquinha/py3 
[FIX] filter to list
 2018-03-08 13:11:58 +05:30
Achilles Rasquinha
908289d40a [FIX] filter to list 2018-03-08 13:10:51 +05:30
Jamsheer
665b48773f Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211) 
* New Document - Patient Service Unit

* Physician - schedule based on patient service unit

* Consultation - Remove validation on submit

* Consultation - Label changed from Drug Prescription to Medication

* Availability check and book appointment based on service unit, appointment invoice creation optimized

* patch fixes

* Patient Service Unit - field - overlap_appointments

* Patient Appointment - Service Unit based scheduling and booking

* Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment

* Codacy fixes on PR #13211

* Codacy fixes on PR #13211

* Fee validity test -fixes

* Fee Validity - test - fixes
 2018-03-08 13:08:35 +05:30
Achilles Rasquinha
11241044b2
Merge pull request #13227 from achillesrasquinha/py3 
[FIX] use text_type instead of unicode, use cmp from past.builtins
 2018-03-08 12:58:21 +05:30
Achilles Rasquinha
9050998e06 [FIX] use text_type instead of unicode, use cmp from past.builtins 2018-03-08 12:55:41 +05:30
theopen-institute
1bfa243190 fix patch that causes error on bench update (#13222) 2018-03-08 11:20:40 +05:30
lasalesi
470977fa13 corrected setup wizard tax rates for Switzerland 2018 (#13220) (#13221) 2018-03-08 11:19:56 +05:30
tundebabzy
1643cce479 fetch journal entry details (#13218) 2018-03-08 11:17:17 +05:30
Manas Solanki
bb42e3b411
Merge pull request #13214 from manassolanki/assessment-report-fix 
minor fix for key error in assessment reports
 2018-03-07 16:30:35 +05:30
Manas Solanki
586e9400b1 minor fix for key error 2018-03-07 16:28:21 +05:30
Shreya Shah
c3bf1fa009 [Fixes] Chapter DocType (#13213) 
* fetch chapter head from member doctype instead of user

* add enabled in grid view and set default as 1
 2018-03-07 16:27:30 +05:30
rohitwaghchaure
bbd9b71547 Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043) 2018-03-07 15:39:40 +05:30
Vishal Dhayagude
668ec25d19 Allow Item variant Rename (#13161) 
* [WIP] Item varient rename

* [wip] Item Variant

* [fix] Item Varient Rename

* [fix] Item Attribution Rename

* removed unwanted code
 2018-03-07 15:31:08 +05:30
Nabin Hait
c50d7446b5 Merge branch 'master' into develop 2018-03-07 13:09:07 +05:30
Nabin Hait
36b4faab48 bumped to version 10.1.6 2018-03-07 13:39:05 +06:00
Saurabh
2b59a851c4
Merge pull request #13166 from saurabh6790/patches_fixes 
[fix] use join instead of subquery
 2018-03-07 12:59:03 +05:30
Manas Solanki
857d4f7a0b
Merge pull request #13209 from manassolanki/guardian-fix 
allow renaming of the guardian
 2018-03-07 12:53:40 +05:30
Manas Solanki
12d7bfb658 allow renaming of the guardian 2018-03-07 12:52:31 +05:30
Raghavendra Kamath
6193b92b70 Add new logo in splash image and optimise pngs (#13206) 2018-03-07 12:39:38 +05:30
Saurabh
ca6e223694 [fix] use join instead of subquery 2018-03-07 12:13:32 +05:30
rohitwaghchaure
343ba85e3a
Merge pull request #13203 from saurabh6790/pe_fix 
[fix] setup_party_account_field on init
 2018-03-07 12:11:46 +05:30
Manas Solanki
1fa992564a fix the desktop icon for course schedule 2018-03-07 12:08:52 +05:30
Saurabh
a65b28772f [fix] setup_party_account_field on init 2018-03-06 18:22:01 +05:30
Achilles Rasquinha
78064b7a45
Update patches.txt 2018-03-05 17:53:23 +05:30
Nabin Hait
c43c95e0aa Fixed merge conflict 2018-03-05 14:54:44 +05:30
Nabin Hait
491ce05b8d bumped to version 10.1.5 2018-03-05 15:17:18 +06:00
Saurabh
2cfcbf933d Patches fixes (#13163) 
* [fix] if serialised items not found then return

* [fix] unicode encoding in patch
 2018-03-05 13:01:15 +05:30
Zarrar
2550180a05 remove updating territory for customers on change (#13162) 2018-03-05 12:32:41 +05:30
Zarrar
950fff0ba1 changes according to the workflow (#13160) 2018-03-05 11:30:53 +05:30
Manas Solanki
5fd7b3bb80 Fix status updater (#13033) 
* fix the status updater for multiple sources

* patch for updating the status

* patch for updating the sales order item

* Update update_status_for_multiple_source_in_po.py
 2018-03-05 11:28:29 +05:30
Vishal Dhayagude
35b665cb26 [new] Create multiple warehouse address and fetch address to stock entry (#13109) 
* [new] Create multiple warehouse address and fetch address to stock entry

* [fix] Deleted unwanted field and added patch to link warehouse details to Address

* [fix] Codacy fixed

* [fix] Modified patch for warehouse address

* [fix] Modified patch for warehouse address

* [fix] Patch updated and removed contact details from stock entry

* [fix] Patch Updated
 2018-03-05 11:10:01 +05:30
Zarrar
4417cb0006 improve multiple add dialog, populate parent's depends on with child tasks (#13142) 2018-03-05 11:08:15 +05:30
Kenneth Sequeira
89795c3f69 Doc imp (#13148) 
* added intro, item and prices video, fixed image links in item and prices

* update 2: first 5 videos added

* added all videos to the user manual

* updated .gitignore
 2018-03-05 11:06:44 +05:30
Zarrar
1e4e004667 leave application assigned by naming_series (#13158) 2018-03-05 11:05:59 +05:30
rohitwaghchaure
a6a4e86dc8 [Fix] System only shows 20 attribute values while making variants (#13155) 2018-03-05 11:03:59 +05:30
rohitwaghchaure
0eb8bb2511 [Fix] Wrong salary slips showing when click on view salary slips from payroll entry (#13152) 2018-03-05 11:03:27 +05:30
rohitwaghchaure
67cfa81de2 [Fix] Stock Ageing report does not work with group warehouse (#13151) 2018-03-05 11:00:42 +05:30
tundebabzy
458a1fe61a codacy 2018-03-03 18:11:48 +01:00
tundebabzy
ef605d5f00 codacy 2018-03-03 18:03:04 +01:00
tundebabzy
3b1251ef47 codacy tinzz 2018-03-03 17:36:07 +01:00
tundebabzy
2379451b68 codacy tinzz 2018-03-03 17:18:47 +01:00
tundebabzy
fbdd5d30e9 more tests and bug fixes 2018-03-03 11:19:18 +01:00
tundebabzy
024c28acf7 fix proration logic to reduce possibility of rounding errors 2018-03-03 10:32:02 +01:00
tundebabzy
79a01561d5 enhancement: do nothing if cancel_sbscription is called for cancelled subscription 2018-03-03 07:39:44 +01:00
tundebabzy
d43422c18e enhancement: ensure subscription is cancelled before attempting to restart 2018-03-03 07:37:59 +01:00
tundebabzy
e13570f343 codacy review 2018-03-02 12:27:12 +01:00
tundebabzy
9e863b9572 Merge branch 'develop' into new-subscription 2018-03-02 11:10:27 +01:00
tundebabzy
c15dc21b7d clean up 2018-03-02 11:00:15 +01:00
tundebabzy
49d34df8f4 more tests 2018-03-02 10:16:57 +01:00
tundebabzy
688fd6b205 prorate invoice when cancelling subscription 2018-03-02 10:16:42 +01:00
tundebabzy
4499e5351c add article 2018-03-02 06:51:33 +01:00
tundebabzy
16afa8765e tiny refactor of invoice setting logic 2018-03-01 17:16:41 +01:00
tundebabzy
9df4f0bd43 fix: apply_discount_on field should be of type Select not Data 2018-03-01 17:12:43 +01:00
tundebabzy
8670c85827 make sure default apply_discount_on is set when creating invoice 2018-03-01 17:11:14 +01:00
tundebabzy
ca5cf35a99 fix: task should explicitly call commit and rollback if error 2018-03-01 17:06:39 +01:00
tundebabzy
36c18c913e docstrings 2018-03-01 16:44:10 +01:00
tundebabzy
0ec445214c hook to hourly scheduler 2018-03-01 11:54:32 +01:00
tundebabzy
78fb12663a fix test 2018-03-01 11:27:48 +01:00
tundebabzy
b91ec79494 update tests and more tweaks 2018-03-01 10:47:00 +01:00
tundebabzy
7eabbd93e1 update start date alone after restarting subscription 2018-03-01 09:09:23 +01:00
tundebabzy
2a11c18383 set initial invoice period based on subscription start 2018-03-01 08:47:38 +01:00
tundebabzy
a93fa16bce freeze screen while waiting for updates on subscription 2018-03-01 08:45:56 +01:00
rohitwaghchaure
a942722619 [Fix] Timeout issue while saving multilevel BOM (#13118) 2018-03-01 13:15:25 +05:30
tundebabzy
328adedbc8 adds start field to record subscrption start date 2018-03-01 08:45:01 +01:00
Nabin Hait
c10bbd6aa7
Editable unallocated amount in pe (#13130) 
* editable unallocated amount in payment entry to handle multi currency

* set unallocated amount on server side

* some minor fixes

* Fixes in territory patch

* removed print

* minor fixes
 2018-03-01 13:14:14 +05:30
Rohit Waghchaure
855d843e55 [Fix] Sales invoice email prompt not working 2018-03-01 13:06:01 +05:30
Harsh Patel
5bebbbe7a9 [Feature] Supplier warehouse link field on purchase order (#13051) 
* Multiple Features:
[New] Supplier warehouse link field on purchase order for sub-contracting
[New] Auto select supplier warehouse while making purchase receipt from purchase order

* Set default to_warehouse in stock entry as the supplier warehouse
 2018-03-01 11:33:25 +05:30
rohitwaghchaure
0df95fa781 Multi-UOM for sales/purchase return (#13132) 
* Multi-UOM for sales/purchase return

* Update sales_and_purchase_return.py
 2018-03-01 11:31:33 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008) 
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
 2018-03-01 10:59:21 +05:30
Zarrar
6578bc11b6 wrong query formed to delete events (#13119) 2018-03-01 10:54:55 +05:30
Nabin Hait
f68dc69078
Set auto created serial nos in incoming transactions in case of multi UOM (#13112) 
* Create user from Employee

* Set auto created serial nos in incoming transactions in case of multi uom
 2018-03-01 10:54:24 +05:30
tundebabzy
3fecbb98c5 Make Expense Claim from Employee Advance #13053 (#13074) 
* allow to make expense claim from employee advance

* make expense claim only if claimed amount < paid_amount

* expense claim made from employee advance is paid
 2018-03-01 10:50:45 +05:30
Zarrar
502af4dd67 display image fnd description for root BOM also (#13099) 2018-03-01 10:44:47 +05:30
rohitwaghchaure
db9fa78ee8 Do not validate payment schedule for POS (#13115) 2018-03-01 10:32:29 +05:30
Nabin Hait
a645f36b2b
Get valuation rate from historical SLE even if it is zero (#13129) 
* Don't overwrite start and end date comes from payroll entry

* Get valuation rate from historical SLE even if it is zero, if records exists

* Valid till should be autoset if not any default value

* Set status of expense claim based on is_paid check
 2018-03-01 10:31:24 +05:30
rohitwaghchaure
332a17ee86 [Fix] Test case for serial no (#13136) 2018-03-01 10:28:04 +05:30
tundebabzy
d9fec69a70 update test case, fix bugs 2018-03-01 05:34:02 +01:00
tundebabzy
8f37926ca8 add ability to cancel, restart and refresh subscription 2018-03-01 04:57:23 +01:00
Achilles Rasquinha
646522886c self.assertEqual 2018-02-28 21:13:51 +05:30
Shreya Shah
a310cc7156 order by modified instead of item name (#13113) 2018-02-28 18:59:55 +05:30
Ameya Shenoy
c20901443e updated develop_version to 11 (#13133) 2018-02-28 17:38:23 +05:30
tundebabzy
2cccad0274 more tests and quick fix 2018-02-28 12:45:09 +01:00
tundebabzy
a5bc057ad4 adds missing 'translatability' 2018-02-28 12:24:16 +01:00
tundebabzy
86ee455cbc more tests and bug fix 2018-02-28 12:21:08 +01:00
tundebabzy
b3d5777e55 more test cases and bug fixes 2018-02-28 12:11:19 +01:00
Achilles Rasquinha
96698c9a77 Use range instead xrange (#13128) 
* Use range instead of xrange

* convert float to int
 2018-02-28 16:12:51 +05:30
Faris Ansari
72d8509b3d
python 3 fix (#13127) 2018-02-28 12:53:34 +05:30
tundebabzy
3aaf693abd adds task -process 2018-02-28 05:12:18 +01:00
tundebabzy
95a4ca9429 update test cases 2018-02-27 18:09:06 +01:00
tundebabzy
9bf029a16e generate new invoice only when current_invoice_end is past 2018-02-27 15:19:02 +01:00
Achilles Rasquinha
11a5f78d3e
Merge pull request #13070 from achillesrasquinha/py3 
[FIX] sorting multiple compares
 2018-02-27 19:48:25 +05:30
tundebabzy
45b6a1719f refactor: 
- current_invoice _start and end should be determined by trial period or billing period
- adds new functions to get billing period data
 2018-02-27 15:14:19 +01:00
tundebabzy
c634ca8737 adds validation to billing_interval_count in Subscription Plan 2018-02-27 14:12:39 +01:00
Nabin Hait
3b43c0d160 Update territory and customer_group patch optimization (#13076) 
* Update territory and customer_group patch optimization

* Update update_territory_and_customer_group.py
 2018-02-27 15:57:14 +05:30
Zarrar
96002c28bd optimize patch for faster execution (#13068) 2018-02-27 15:57:01 +05:30
Zarrar
91fc1a8fbe Update Territory & Customer Group across all transaction (#13004) 
* added method for update query based on changes

* patch added

* updated function, moved util function
 2018-02-27 15:56:38 +05:30
tundebabzy
3c26a7e862 adjusts query so multiple plans can be used to create single invoice 2018-02-27 09:36:29 +01:00
tundebabzy
559d01e176 allows to rename subscription plan 2018-02-27 09:13:35 +01:00
tundebabzy
07313c281a adds more assertions to test cases 2018-02-27 09:00:13 +01:00