Frappe Bot
88c88d6e7c
Merge branch 'master' into staging-fixes
2018-11-13 10:59:05 +00:00
khushalti
fad08e1bcb
[fix] - GL entry not creating on PR if rejected qty mentoned ( #15815 )
2018-11-13 12:09:32 +05:30
Nabin Hait
3c29967d27
Fixed merge conflict
2018-10-15 15:43:21 +05:30
rohitwaghchaure
94fcb0e9f9
[Enhance] Add user image in the employee from the user ( #15680 )
2018-10-15 14:57:46 +05:30
Jamsheer
14c6ab0ee9
[fix] Healthcare field and desktop icon ( #15638 )
...
* Test Inpatient Record - Fix
* Test Inpatient Record - Fix
* Healthcare - Patch rename_healthcare_doctype_and_fields - Updated
* Healthcare - Desktop Icons - Updated
* Healthcare - Patch change in healthcare desktop icons
* Healthcare Util - fix - appointments valid in fee validity
* Healthcare Settings - field label change
* Patient allow rename
* fix: remove unused variable
2018-10-10 14:44:36 +05:30
Ameya Shenoy
18310c240f
fix(patch): delete hub documents
...
While deteting the "Data Migratun Plan" docs the patch used to break,
since it was linked to docs from "Data Migration Run". Modified the
patch to also delete the linked "Data Migration Run" docs.
2018-09-12 17:46:58 +05:30
Prateeksha Singh
5ba14fe685
[patch][fix] remove hub node module removing code
2018-09-12 16:59:17 +05:30
Saurabh
393dd4286a
[resolved] merge-conflicts
2018-09-12 14:48:30 +05:30
Zarrar
68000c66fc
check if Data Migration Plan exists before deleting ( #15368 )
2018-09-09 19:19:13 +05:30
Zarrar
8448d9014d
[Fix] Patch fixes ( #15350 )
...
* fix typo in fieldname
* fallback for work_order/production_order in timesheet
2018-09-09 19:18:41 +05:30
Nabin Hait
562d942a7d
fix(patch): gst state number in address where number is less than 10
2018-09-07 16:14:44 +05:30
Nabin Hait
4fd1cebf95
fix(patch): Delete all documents from Hub Node module
2018-09-06 18:53:46 +05:30
Saurabh
0754ece288
Patch fixes ( #15295 )
...
* patch fixes
* [Fix] disable shopify if any exception occured while
2018-09-03 10:44:40 +05:30
Saurabh
5c3590fa8d
Merge branch 'master' into develop
2018-08-31 11:29:14 +05:30
Shreya Shah
3df2639a32
Optimize patch ( #15263 )
2018-08-30 17:24:03 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
rohitwaghchaure
ecc6af9d2a
[Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project ( #15171 )
2018-08-20 17:39:54 +05:30
Shreya Shah
0631aed3d9
Discount amount field in all transactions' child tables ( #15124 )
...
* Add discount_amount and base_discount_amount in Sales Invoice Item
* Add patch for existing documents
* Discount amount field in all child tables of Purchase and Selling
* Remove console statements
2018-08-14 10:51:48 +05:30
Nabin Hait
c13960ddc9
minor fix
2018-08-09 18:25:03 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
Rushabh Mehta
69fa808def
[minor] fixes + patch ( #14937 )
2018-07-17 18:22:51 +05:30
rohitwaghchaure
cc9c7d5e2a
[Fix] GSTIN not displaying in the address print ( #14855 )
...
* [Fix] GSTIN not displaying in the address print
* Made changes in the patch and set Patch as False
* Update update_address_template_for_india.py
2018-07-10 15:41:42 +05:30
Shreya Shah
f1e54836cb
Remove hardcoded workflow patches ( #14340 )
2018-06-05 10:35:07 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Shreya Shah
ae95a8aa15
Update status in Purchase Receipt ( #14257 )
...
* Update status on submission if per_billed = 100
* Add patch to update existing records
2018-05-28 18:24:28 +05:30
Shreya Shah
1906cadd94
[Fix] Currency field in Pricing rule ( #14004 )
...
* some minor changes
* Set query for price list based on currency
* Validate Price list with currency
2018-05-16 11:20:30 +05:30
Saurabh
ac2692711b
Merge branch 'master' into develop
2018-05-15 14:59:38 +05:30
Saurabh
29160441bb
[fix] if UOM and Warehouse link is invalid then set blank values
2018-05-15 14:56:18 +05:30
Nabin Hait
abd0325acd
Fixed merge conflict
2018-05-05 12:19:14 +05:30
Saurabh
ed393d1025
[fix] consider user permissions in leave application calendar view ( #13902 )
...
* [fix] consider user permissions in leave application calendar view
* add hr settings to control leave calendar view
* add patch
2018-05-03 18:52:25 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings ( #13897 )
2018-05-03 16:24:52 +05:30
Saurabh
1d5bbe1081
Merge branch 'master' into develop
2018-04-25 12:46:50 +05:30
Rohit Waghchaure
bf416cfbf8
[Fix] POS Patch
2018-04-25 12:32:22 +05:30
Saurabh
63590496c1
[fix] resolved merge conflicts
2018-04-25 11:32:54 +05:30
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Nabin Hait
4d9e104284
Merge branch 'master' into develop
2018-03-28 15:51:18 +05:30
Nabin Hait
7041a45294
Update fix_reserved_qty_for_sub_contract.py
2018-03-28 15:50:14 +05:30
Nabin Hait
6c35822a35
Merge branch 'master' into develop
2018-03-28 10:40:14 +05:30
Nabin Hait
2e203e53c6
Update fix_reserved_qty_for_sub_contract.py
2018-03-28 10:38:55 +05:30
Nabin Hait
9db28ef90d
Minor fix in patch
2018-03-27 16:00:57 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +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
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
Manas Solanki
0f6c35d63f
Update update_project_in_sle.py
2018-03-21 18:24:45 +05:30
rohitwaghchaure
93779c21a7
[Fix] Project not set in the stock ledger entry ( #13357 )
2018-03-21 17:52:41 +05:30
Manas Solanki
c711445b91
add the student as party type ( #13348 )
2018-03-21 10:12:27 +05:30
Shreya
9602bf4ba3
patch fix
2018-03-19 18:17:54 +05:30
Achilles Rasquinha
d8f7de9946
fixed patch for hub
2018-03-15 12:48:32 +05:30
Nabin Hait
e01dcc170c
Merge branch 'master' into develop
2018-03-13 17:11:52 +05:30
