Commit Graph

21752 Commits

Author SHA1 Message Date
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
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
Achilles Rasquinha
aa4d7a3436
Update .travis.yml 2018-03-20 01:37:27 +05:30
Achilles Rasquinha
58606b643a
Updated .travis.yml for Python 2 and 3 2018-03-20 01:35:50 +05:30
Achilles Rasquinha
b714643ca2
Merge pull request #13332 from achillesrasquinha/fixes
Check Set Sales Target Item exists in User Slides
2018-03-19 22:18:20 +05:30
Achilles Rasquinha
d0786b45c3 fix issue 2018-03-19 22:17:37 +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
984ec2652e
Merge pull request #13322 from achillesrasquinha/fixes
Fixed dict_keys concatenation
2018-03-18 10:09:48 +05:30
Achilles Rasquinha
1e95323679 Fixed dict_keys concatenation 2018-03-18 10:08:43 +05:30
Nabin Hait
c8cd4ba6f7 Merge branch 'master' into develop 2018-03-15 12:38:43 +05:30
Nabin Hait
b2d318ec48 Merge branch 'hotfix' 2018-03-15 12:38:41 +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
d7f32e492f Merge branch 'hotfix' 2018-03-14 13:33:36 +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
f5ad339cae Merge branch 'hotfix' 2018-03-13 18:13:43 +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
9a398b4742 Merge branch 'hotfix' 2018-03-13 17:11:49 +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
d98a6d81eb Merge branch 'hotfix' 2018-03-13 16:14:02 +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
9fb7e2fe04
Merge pull request #13283 from achillesrasquinha/py3
string_types from basestirng
2018-03-12 19:16:55 +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
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