Nabin Hait
45d337a016
Merge branch 'master' into develop
2017-05-25 14:19:51 +05:30
Nabin Hait
d45a036b5e
Merge branch 'hotfix'
2017-05-25 14:19:50 +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
ca89b6f59c
Merge branch 'hotfix'
2017-05-24 18:38:33 +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
cf1e0508af
Merge branch 'hotfix'
2017-05-24 09:07:26 +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
f8b412ba98
Merge branch 'hotfix'
2017-05-23 17:48:42 +05:30
