Rushabh Mehta
e0434ad40e
Merge branch 'develop' into bom_convert_uom
2017-06-15 17:32:27 +05:30
mbauskar
5da3ac63bf
[minor] fixed merge conflicts
2017-06-15 16:09:42 +05:30
mbauskar
ac13627222
Merge branch 'hotfix'
2017-06-15 16:05:49 +05:30
mbauskar
489550ed59
bumped to version 8.0.50
2017-06-15 16:35:49 +06:00
Makarand Bauskar
950ad36352
Merge pull request #9306 from nabinhait/in_words_col_len
...
Change column length of in_words
2017-06-15 16:03:09 +05:30
Makarand Bauskar
a4af7cb7d3
removed extra quote from query
2017-06-15 16:02:44 +05:30
Nabin Hait
5aee7d1b70
Change column length of in_words
2017-06-15 15:35:08 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
mbauskar
8dbee03467
Merge branch 'hotfix'
2017-06-15 13:29:40 +05:30
mbauskar
39f4130a0a
bumped to version 8.0.49
2017-06-15 13:59:40 +06:00
Nabin Hait
6e9a146f2b
Merge pull request #9193 from tundebabzy/issue_9180
...
Payment Entry - Latest Exchange Rate not fetched
2017-06-15 12:34:27 +05:30
Makarand Bauskar
428e5b7172
Merge pull request #9299 from rohitwaghchaure/refernce_name_issue
...
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:32:00 +05:30
Nabin Hait
2153399c39
Create journal_entry.py
2017-06-15 12:30:58 +05:30
Rohit Waghchaure
5ea8c97b7c
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:16:15 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
rohitwaghchaure
03ba66d0d8
[Fix] In sales invoice, delivery note link not showing in the dashboard if delivery note has made from sales invoice ( #9290 )
2017-06-14 19:41:11 +05:30
Umair Sayed
0b8e19b5d8
Added new help pages as per OKR - DO NOT MERGE ( #9291 )
...
* added help pages on Assessment, delete and restore documents and Document versioning, fixed #9262
* some fixes in help docs
2017-06-14 19:40:08 +05:30
tunde
3514332cd8
changes journal_entry.get_exchange_rate to return exchange rate at date not average exchange rate
2017-06-14 13:14:40 +01:00
Manas Solanki
67c4f1713b
Minor changes in the UX and courses automatically fetched upon saving ( #9264 )
2017-06-14 17:34:36 +05:30
Manas Solanki
95ca531def
make quotation against lead company name ( #9188 )
2017-06-14 16:13:23 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Sagar Vora
847444724b
remove bracket ( #9284 )
2017-06-14 15:51:47 +05:30
Sagar Vora
d19c2e2e93
[minor] Check if item is stock item before validating Warehouse while Purchase Return ( #9282 )
...
* Check if item is stock item before validating Warehouse
* changed logic to decide warehouse_mandatory
2017-06-14 15:39:41 +05:30
KanchanChauhan
c849f647f7
Show Stock Level only if any value(actual, reserved, reserved for production or projected) exists ( #9168 )
2017-06-14 15:37:47 +05:30
Manas Solanki
40be3f4048
fix in the item for the function make_variant_item_code ( #9280 )
2017-06-14 15:06:07 +05:30
Manas Solanki
737482423b
change in the absent student report ( #9185 )
2017-06-14 15:05:48 +05:30
tundebabzy
5c9dd42547
fixes #9098 : don't skip calculation if income or expense is [] ( #9267 )
2017-06-14 14:57:34 +05:30
rohitwaghchaure
4c0f9dac94
Total amount not showing for credit note column in the print ( #9278 )
2017-06-14 12:54:48 +05:30
Makarand Bauskar
0da5f23db6
[minor] fixed Cannot read property 'default_letter_head' of undefined ( #9268 )
2017-06-14 12:52:13 +05:30
Sagar Vora
99a2db80ab
move bom based rate calculation to end ( #9271 )
2017-06-14 12:38:27 +05:30
rohitwaghchaure
1b2b4a626f
[Fix] Accounts receivable report showing wrong currency for total amount against the customer ( #9276 )
2017-06-14 12:32:52 +05:30
bcornwellmott
d53dd7f4c9
Merge branch 'develop' into bom_convert_uom
2017-06-13 08:40:24 -07:00
Sagar Vora
489ab6d70d
[minor] remove hardcoded flt precision and use system default ( #9250 )
...
* possible fix
* use system default precision for flt
2017-06-13 18:58:47 +05:30
tundebabzy
26a39610ca
fixes #8941 : Better error message for duplicate items ( #8968 )
...
* fixes #8941 : Better error message for duplicate items
* gathers all non unique items instead of first encountered non unique item
* renders errored items with `br` instead of `li`
2017-06-13 17:40:56 +05:30
Ashwini Save
eed0cee186
Solve issue for while changing status of sales order page not reloading ( #9204 )
...
* Solve issue for while changing status of sales order page not reloading
* Close Sales order issue : code review Changes.
2017-06-13 17:14:06 +05:30
Makarand Bauskar
da15486624
Merge pull request #9260 from mbauskar/address-and-contacts
...
[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)
2017-06-13 17:08:56 +05:30
Makarand Bauskar
a7a7c835cc
Merge pull request #9196 from msiddiq0/patch-2
...
Fix incorrect youtube link on Video Tutorials
2017-06-13 17:05:50 +05:30
Makarand Bauskar
f339f6d69f
Merge pull request #9195 from msiddiq0/patch-1
...
Fixed wrong YouTube video link
2017-06-13 17:05:36 +05:30
Makarand Bauskar
65f5cf3fc1
Merge pull request #9197 from msiddiq0/patch-3
...
Fix incorrect YouTube link on Video Tutorials
2017-06-13 17:05:19 +05:30
mbauskar
96ce5821b8
[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)
2017-06-13 17:03:13 +05:30
Makarand Bauskar
0c5d732cd8
Merge pull request #9208 from mbauskar/docs
...
removed {next} from documentation and removed the globals from custom scripts
2017-06-13 16:32:26 +05:30
Makarand Bauskar
70ef313b0d
Merge pull request #9245 from frappe-pr-bot/translations-2017-06-13
...
[translation] translation update
2017-06-13 16:23:22 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Saurabh
b7ef28d23d
Merge branch 'hotfix'
2017-06-13 15:20:13 +05:30
Saurabh
797f2030f8
Merge branch 'master' into develop
2017-06-13 15:20:13 +05:30
Saurabh
0b35a3a67a
bumped to version 8.0.48
2017-06-13 15:50:13 +06:00
frappe-pr-bot
f7fe66cc48
[translation] translation updates
2017-06-13 11:17:57 +02:00
Makarand Bauskar
8ce53c94d1
Merge pull request #9189 from mbauskar/mysql-lockout
...
[hotfix] fixes for mysql Lock wait timeout exceeded
2017-06-13 14:41:42 +05:30
mbauskar
6f71648719
[minor] removed the else condition in update_qty
2017-06-13 14:36:30 +05:30
mbauskar
f819c93329
[minor] replaced db_save by db_update and added patch to remove the indexes on tabBin
2017-06-13 13:22:34 +05:30
