Nabin Hait
79c2191aa3
[fix] Don't add newline at the end, onchange of serial_no and filter warehouse based on company and is_group ( #9809 )
2017-07-12 14:10:43 +05:30
Nabin Hait
f012a9db70
Merge pull request #9812 from adityaduggal/wrong_state_codes
...
Changed state codes and added state
2017-07-12 14:03:39 +05:30
Aditya Duggal
4e1a3c1d58
Changed state codes and added state
...
-Andaman 35 added
-UP changed to 09 from 35
-Uttrakhand changed to 05 from 36
2017-07-12 13:40:11 +05:30
Nabin Hait
fb8e59234b
Merge pull request #9652 from bcornwellmott/sq_lead_time
...
Added lead time field to supplier quotation
2017-07-11 23:39:27 +05:30
Umair Sayed
31af0849db
Update navigation.md ( #9798 )
2017-07-11 21:07:03 +05:30
Frappe PR Bot
bfdb726072
[translation] translation updates ( #9788 )
2017-07-11 15:20:11 +05:30
mbauskar
a8406e1544
Merge branch 'develop'
2017-07-11 13:02:15 +05:30
mbauskar
b2aa867b70
bumped to version 8.3.6
2017-07-11 13:32:14 +06:00
Makarand Bauskar
30f2bcbccc
[hotfix] allow only 5 character in company_abbr field in setup wizard ( #9779 )
2017-07-11 12:36:57 +05:30
Prateeksha Singh
7d885432eb
[wiz] add user slide, enforce first entry, static labels ( #9744 )
2017-07-11 12:36:34 +05:30
Nabin Hait
3b5f774144
Merge pull request #9410 from manassolanki/patch-company
...
Patch for the PR 8754, fixes #9011
2017-07-11 11:35:29 +05:30
Nabin Hait
3a200bbc44
Update create_address_doc_from_address_field_in_company.py
2017-07-11 11:34:27 +05:30
Nabin Hait
2bedca04ae
Merge pull request #9750 from rohitwaghchaure/taxable_amount_issue
...
[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice
2017-07-11 11:16:56 +05:30
Manas Solanki
1a0536bff4
changes as per review
2017-07-11 11:16:16 +05:30
Manas Solanki
cdba021802
patch for removing the address field from company and creating address doc, fixes #9011
2017-07-11 11:16:16 +05:30
Shivam Mishra
3fe5ecc611
Added Lead fixture, Added test for Lead, Opportunity ( #9607 )
...
* Added fixtures for Address and Contact
* Fixed formatting errors
* Added Test for terms, Added Tax and Terms fixture
* Add tests for tax
* Added Test for Print Format
2017-07-11 10:33:07 +05:30
Rohit Waghchaure
296fbfeaac
[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice
2017-07-10 23:06:49 +05:30
Rushabh Mehta
4a7b4efbec
[tests] update travis.yml to run ui-tests ( #9748 )
...
* [tests] update travis.yml to run ui-tests
* [tests] update travis.yml to run ui-tests
* [test] fix item_group.py
* [test] fix item_group.py
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] no scheduled jobs for tests
* [check] daily work summary fails?
* [check] daily work summary fails?
2017-07-10 23:00:01 +05:30
Ben Cornwell-Mott
b1f0fd4ac3
Lead time matches Item master
2017-07-10 09:09:29 -07:00
Nabin Hait
f7d2a59c18
Merge pull request #9538 from sagarvora/fix-bom-issue
...
[minor] fix bom price resetting on validation
2017-07-10 20:41:16 +05:30
Nabin Hait
0ac8542eaa
Merge pull request #9772 from tundebabzy/issue-9595
...
Wrong Exchange Rate when making payment against Journal Entry (#9595 )
2017-07-10 19:12:48 +05:30
Nabin Hait
c8b6d3badb
Merge pull request #9713 from manassolanki/stud-dashb
...
changes in the student dashboard
2017-07-10 19:10:57 +05:30
Nabin Hait
cdf4320b3b
Merge pull request #9673 from rohitwaghchaure/serial_no_sales_return_issue
...
Remove sales invoice from serial number while making sales return entery using delivery note
2017-07-10 19:04:30 +05:30
Nabin Hait
5b2d3222f3
Merge pull request #9710 from rohitwaghchaure/sales_invoice_dn_link_revert
...
Revert sales invoice dn link issue
2017-07-10 18:47:38 +05:30
Manas Solanki
5d202ca31a
change in the student type
2017-07-10 18:40:53 +05:30
Nabin Hait
7088db9e1f
Merge pull request #9773 from mbauskar/docs
...
[docs] corrected the filename from sms_setting2 -> sms_settings2
2017-07-10 18:17:28 +05:30
Nabin Hait
ec344ffa96
Merge pull request #9761 from mbauskar/depends-on
...
[minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field
2017-07-10 18:16:15 +05:30
mbauskar
a52e726b6b
[docs] corrected the filename from sms_setting2 -> sms_settings2
2017-07-10 18:11:32 +05:30
Nabin Hait
cf82c3828e
Merge pull request #9769 from manassolanki/payment-entry
...
frappe call if posting date is defined
2017-07-10 17:57:26 +05:30
Nabin Hait
6fcfbaa1f9
Merge pull request #9766 from nabinhait/migration_fixes
...
minor fixes while upgrading an old instance
2017-07-10 17:45:25 +05:30
Nabin Hait
a6c733d06c
Merge pull request #9753 from rohitwaghchaure/budget_cost_center_issue
...
[Fix] Budget against the field in the validation message
2017-07-10 17:45:02 +05:30
tunde
46ef26df71
treat use case where Journal entry is contained in outstanding_invoices in get_outstanding_reference_documents function
2017-07-10 13:05:29 +01:00
Manas Solanki
99d571a786
frappe call if posting date is defined
2017-07-10 17:33:27 +05:30
Rohit Waghchaure
e3ae600277
[Fix] Budget against the field in the validation message
2017-07-10 17:06:54 +05:30
Nabin Hait
dd7a723214
minor fixes while upgrading an old instance
2017-07-10 16:41:59 +05:30
mbauskar
ccaf36a00f
[minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field
2017-07-10 16:24:24 +05:30
Manas Solanki
101a021f7b
added student type in program enrollment and changes in the student dashboard
2017-07-10 16:21:44 +05:30
Nabin Hait
68ed0488a3
Merge pull request #9757 from mbauskar/breadcrumb-fixes
...
[hotfix] check if the item group exist or not
2017-07-10 15:32:52 +05:30
mbauskar
75a233b472
[hotfix] check if the item group exist or not
2017-07-10 14:36:42 +05:30
Nabin Hait
5a174d61bc
Merge pull request #9754 from creamdory/develop
...
Added Quotation as Standard Sidebar Menu
2017-07-10 14:13:35 +05:30
creamdory
7a2815299e
Added Quotation as Standard Sidebar Menu
2017-07-10 16:09:03 +08:00
Manas Solanki
195d2b577f
add few details in the student log ( #9670 )
2017-07-10 12:29:46 +05:30
Britlog
8c85562ceb
Breadcrumbs management ( #9544 )
2017-07-10 12:14:05 +05:30
Manas Solanki
77aa4762b8
don't request another ajax call if one is pending ( #9620 )
2017-07-10 12:12:16 +05:30
Nabin Hait
35ecab6a52
Merge branch 'develop'
2017-07-08 13:55:41 +05:30
Nabin Hait
097da8cc89
bumped to version 8.3.5
2017-07-08 14:25:41 +06:00
Nabin Hait
1d52a4df22
Merge pull request #9732 from adityaduggal/gstin_NA
...
First 2 digit validation would disregard NA values
2017-07-08 13:52:35 +05:30
Nabin Hait
cd61a20fb4
Update utils.py
2017-07-08 13:52:13 +05:30
Nabin Hait
8f7eb358b8
Merge pull request #9730 from nabinhait/prod_fix
...
Finish prod order when skipped material transfer
2017-07-08 13:50:52 +05:30
Aditya Duggal
0e285265b1
First 2 digit validation would disregard NA values
2017-07-08 13:35:01 +05:30
