Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,398 Commits 3 Branches 0 Tags 1 GiB
a22aa60a17
Commit Graph

1089 Commits

Author SHA1 Message Date
Prateeksha Singh
84d358bd0a
Merge pull request #14708 from pratu16x7/hub-fixes 
[hub] add link in modules
 2018-06-28 03:23:03 +05:30
Prateeksha Singh
2e0b5140e7 [hub] add link in modules 2018-06-28 03:17:39 +05:30
Rushabh Mehta
096b943b0c [minor] fixes to moment.defaultDateFormat and daily work summary eplies 2018-06-25 22:38:20 +05:30
rohitwaghchaure
79e5b07e62 [Fix] Subscription method (#14604) 
* [Fix] Subscription method path

* [Fix] Condition
 2018-06-21 12:58:14 +05:30
Zarrar
e25dcd2737 [Minor] Report related fixes (#14620) 
* fix in query incase list is empty

* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated

* unset currency filter to apply default currency or so

* python 2 - 3 fix
 2018-06-21 10:53:12 +05:30
Charles-Henri Decultot
fc2292f08c Email alert renamed to Notification (#14618) 2018-06-21 09:17:52 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Nabin Hait
875c941f3d fixes in setting itemised tax breakup 2018-06-18 17:41:27 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
Manas Solanki
2df1b31707 [minor] minor fixes along with the codacy 2018-06-14 15:55:38 +05:30
Manas Solanki
e5e87f7137 [feature] Blanket Order 
- Creaete Sales or Purchase order from the blanket order
- If there is any blanket order for the customer/supplier rates will be fetched from that order
- Manually selecting the Blanket order will change the rates accordingly
- Upon submission of the order, the ordered qty will be updated in the Blanket Order
 2018-06-14 15:55:38 +05:30
Zarrar
6ffdf94003 [Fixes] Defaults and User-Permission based fixes in treeview (#14501) 
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data

* make use of utility function for treeview
 2018-06-14 12:24:16 +05:30
Rohit Waghchaure
f270567c45 [Fix] Test cases for asset 2018-06-12 12:20:52 +05:30
Prateeksha Singh
ea7533fa75 [tax-breakup] store itemized tax by item_name when can 2018-06-11 13:31:33 +05:30
Prateeksha Singh
00ab78d768 [hub] set page title dynamically 2018-06-07 14:13:00 +05:30
Prateeksha Singh
9a7f957ace [hub] fix item page recursion 2018-06-07 12:40:40 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
Sushant Nadkar
64907e5083 Validate response message for frappe call (#14343) 2018-06-05 10:33:04 +05:30
rohitwaghchaure
5ecc26bf15 [Fix] get_shipping_address() takes at least 1 argument (0 given) (#14328) 2018-06-04 11:00:24 +05:30
Prateeksha Singh
8ac7dfee36
Merge pull request #14329 from pratu16x7/hub-fixes 
[hub][minor] remove links #14309
 2018-06-04 10:28:47 +05:30
Prateeksha Singh
e73df88863 [hub][minor] remove links #14309 2018-06-04 10:26:49 +05:30
rohitwaghchaure
780952ea03 Show actual qty in warehouse link search (#14258) 2018-05-31 09:29:18 +05:30
Prateeksha Singh
09e46a4e5f Hub fixes (#14281) 
* [hub] remove list freeze

* [hub] fix svg in icon

* [hub] implement route options in hub list view
 2018-05-30 15:12:20 +05:30
Shreya Shah
e329038aaa Total Quantity in Sales and Purchase DocTypes (#14114) 
* Add  field to all sales and purchase doctypes

* Add patch to update existing records

* Modify taxes_and_totals.py
 2018-05-28 11:49:08 +05:30
Valmik Jangla
b52d5b21a1 Add UOM to Item View with Price 2018-05-17 00:09:21 -07:00
Doridel Cahanap
e42192bb6c [WIP] Alternative items (#13705) 
* Alternative Items in BOM

* Alternative Items in Work Order
 2018-05-16 10:58:39 +05:30
rohitwaghchaure
f9fa588ddc
Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po 
[Enhance] Budget validation on material request, purchase order
 2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc [Enhance] Budget validation on material request, purchase order 2018-05-15 22:12:44 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate 
[Enhancement] Buying and Selling checkboxes in Currency Exchange
 2018-05-15 17:55:09 +05:30
Shreya
3f77852e93 Pass buying or selling as filter parameters 
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
 2018-05-15 17:22:06 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Shreya
0db85067b2 Add For Buying and For Selling checkboxes in Currency Exchange 2018-05-15 12:48:10 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Faris Ansari
404f39d373 [fix] apply price list 
in_apply_price_list flag remains true if server exception occurs
 2018-05-14 15:46:45 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
Nabin Hait
b9fed2aa38 Removed company from Finance Book and related changes 2018-05-09 15:10:29 +05:30
Gaurav Naik
8cbbdfdf30 Added finance book filter to financial_statements.js 2018-05-09 15:03:05 +05:30
Shreya Shah
204c3bc37e Remove Production Planning Tool docs (#13946) 
* Remove Production Planning Tool docs

* Remove Offer Letter Occurrences

* Rename Employee Loan Occurrences
 2018-05-07 18:21:03 +05:30
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +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
Prateeksha Singh
a7c6ff8f3e
Merge pull request #13837 from shreyashah115/serial-batch-linking 
Serial No. and Batch No. linking
 2018-05-02 15:11:19 +05:30
rohitwaghchaure
0065624fe0 Tax amount showing under wrong tax header in the report (#13843) 2018-05-02 12:20:55 +05:30
Shreya
14bd43d5eb minor changes 2018-04-30 15:30:42 +05:30
Shreya
a20157af17 on item, warehouse and batch triggers, fetch serial nos based on batch 2018-04-26 14:39:21 +05:30
Prateeksha Singh
420c79041e [fix] company listing context 2018-04-05 14:44:16 +05:30
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Prateeksha Singh
b60a52b194 Hub Market (#13325) 
* [hub] enable hub with OAuth token from user's client ID

* [hub] settings schema for adding users

* [hub] image view style listing

* [hub] broken image link fallback

* [wip]

* [hub] bootstrap timeline

* [hub] setup quick view

* [hub] reformat ratings, add companies autocomplete filter

* [hub] common listing frames

* [hub] setup sort selector

* [hub] timeline

* [hub] customize list header

* [hub] genuine form fieldtypes

* [hub] review products

* [hub] suggest missing categories remotely

* [hub] Wishlist; header and title templates

* [hub] link wishlist, remove company migration

* [hub] calculate ratings
 2018-04-03 10:44:13 +05:30
Charles-Henri Decultot
6860036b01 Agriculture module corrections (#13438) 
* Agriculture module corrections

* Update ternary_plot.js
 2018-04-02 10:51:53 +05:30
Shreya Shah
5d71609f0b Timer fixes (#13443) 
* alert for exceeded time only when dialog is open

* fetch row having an activity without from_time

* fixes if timesheet created from work order

* reset timer limit exceeded
 2018-04-02 10:32:39 +05:30
Manas Solanki
a7f5589564 fix for the update button in the sales invoice (#13435) 2018-04-02 10:32:00 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30
Ameya Shenoy
c5d222253a
Permisssion fixes for child table 
Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3
frappe.client.[get_list, get, get_value] when called on child table
needs parent as an argument or it throws an error by default
 2018-03-29 13:16:08 +05:30
rohitwaghchaure
68ba4fd697 [Fix] Multi-batch selection issue in POS (#13407) 2018-03-28 12:33:15 +05:30
rohitwaghchaure
a3c3dec5a2 [enhance] Item Alternative (#13121) 
* [enhance] Item Alternative

* Added two way provision in item alternative

* Test Cases

* documentation
 2018-03-28 11:51:44 +05:30
Zarrar
7f4cd3f5ea Update Docs for Work Order (#13403) 
* update docs

* rename files, update pngs

* update pngs for timesheet, leftover changes
 2018-03-27 14:59:49 +05:30
Nabin Hait
b9c82b9790 Fixed merge conflict 2018-03-27 14:25:27 +05:30
Shreya Shah
149f7ee875 [Fix] General Ledger Report (#13374) 
* error fix if party_type = student or shareholder

* clear party filter when party_type changes to avoid error throw

* dict with values of party_name in utils.js

* fetch party_name from erpnext.utils.get_party_name

* Update general_ledger.py
 2018-03-27 11:29:25 +05:30
Shreya
8bb0f05451 added task field 2018-03-23 11:46:45 +05:30
Shreya
822ba21f38 codacy fix 2018-03-23 11:41:56 +05:30
Shreya
559011404a removed timesheet.html, appended it as a helper function 2018-03-23 11:41:56 +05:30
Shreya
5bf24be704 minor fixes 2018-03-23 11:41:56 +05:30
Shreya
8f06266838 all fields editable 2018-03-23 11:41:55 +05:30
Shreya
68ec22a90c moved timer.js to public/js 2018-03-23 11:41:55 +05:30
rohitwaghchaure
6a2d073fe1
Merge pull request #13353 from PawanMeh/fixes_13352 
Add total qty to offline POS
 2018-03-22 11:36:32 +05:30
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports (#13344) 2018-03-22 11:12:02 +05:30
pawan
53a4d2c430 [fix] #13352 2018-03-21 09:19:36 +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
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
Nabin Hait
c3889d85a1
Update shopping_cart.js 2018-03-09 16:28:25 +05:30
rohitwaghchaure
a32e57ae82 [Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233) 2018-03-08 16:21:13 +05:30
Raghavendra Kamath
6193b92b70 Add new logo in splash image and optimise pngs (#13206) 2018-03-07 12:39:38 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
rohitwaghchaure
4e8fdf7b3f [Enhance] Quality Inspection Template (#12988) 
* [Enhance] Quality Inspection Template

* Test case and patch

* Update make_quality_inspection_template.py
 2018-02-22 11:03:48 +05:30
Faris Ansari
7c744acc49
Changes for Rollup (#12924) 
* Changes for rollup

* remove variables.less
 2018-02-20 14:21:50 +05:30
Jay Parikh
33b2614377 [Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966) 2018-02-16 14:45:40 +05:30
Zarrar
441a1e1b8a Validate Bank name in Setup wizard on the same slide (#12968) 
* validate bank name before moving on to next slide

* Update setup_wizard.js
 2018-02-16 14:44:42 +05:30
Shreya Shah
3a9eec2e92 Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913) 
* pass bill_date as parameter and calculate due_date on that basis

* calculate payment_schedule on the basis of bill_date if present else posting_date

* add bill_date as an argument to get_party_details

* pass bill_date on supplier trigger in purchase invoice
 2018-02-16 13:05:21 +05:30
Shreya Shah
8b531c1ee6 Fix parenthesis in buying controller (#12923) 2018-02-15 11:21:49 +05:30
Prateeksha Singh
387a242232
Merge pull request #12928 from pratu16x7/hub-pages 
Hub pages
 2018-02-15 11:05:22 +05:30
Prateeksha Singh
9889899603 [hub] cleanups 2018-02-15 10:54:23 +05:30
Prateeksha Singh
1ad072f2a9 [hub] cleanups 2018-02-15 10:47:59 +05:30
Prateeksha Singh
2073959bb8 Update entity properties 2018-02-15 10:24:16 +05:30
Prateeksha Singh
6ee035ba5b tree parent working 2018-02-15 08:50:31 +05:30
Prateeksha Singh
25d5a1d890 add company pages 2018-02-14 19:53:18 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests (#12900) 
* Fixed translations and tests

* minor fixes

* minor test fixes
 2018-02-14 17:44:06 +05:30
Saurabh
2735701aab resolved merge conflicts 2018-02-14 11:51:09 +05:30
rohitwaghchaure
8e675ebbe2 [Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898) 2018-02-13 17:11:06 +05:30
tundebabzy
6e90f49a35 Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714) 
* unconditionally fetch exchange rate

* Revert "unconditionally fetch exchange rate"

This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a.

* allow for `plc_conversion_rate` field to be reset

* fetch exchange rate using price list currency and company currency not form currency

* clean up
 2018-02-12 15:18:57 +05:30
tundebabzy
c89782502c Report presentation currency (#12670) 
* Add new Select to filters

* get the currencies from database rather than hardcoded

* label report columns:
- If presentation currency is available in filters, use it or
- If company is available in filters, use it or
- use default company currency

* add new function - get_currency

* tweak new function `get_currency`

* add new function `convert` to convert a value to another currency

* add new function `convert_to_presentation_currency`

* clean up `get_currency` first pass

* memoise the exchange rates

* limit fetched GL entries to to_date

* check if account type is p&l or not and use appropriate exchange rate based on that

* change EXCHANGE RATE to a dict, use for memoisation

* rename EXCHANGE_RATE

* cache exchange rates and use them as needed

* add docstrings

* add presentation currency logic to financial statement reports

* move new functions from `general_ledger.py` to new module

* clean up

* PEP 8 clean up

* move function to util.py

* PEP 8 clean up

* remove presentation currency option from cashflow

* adjust currency as needed

* allow users to save presentation currency in Accounts Settings

* add new function `get_presentation_currency_list`

* refactor query_report modules with no promises

* Revert "allow users to save presentation currency in Accounts Settings"

This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b.

* show print page in correct currency

* Update utils.py
 2018-02-12 15:04:50 +05:30
sivankar
621740efd9 Enhancement and bug fix in batch (#12753) 
* merge shelf like and manufacturing date

* setting default manufacturing date as todays date

* setting default manufacturing date as todays date

* fix

* Improvements to batch auto naming (#12496)

* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method

* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method

* add documentation and rename some functions

* PEP 8 compliance

* test

* added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set

* bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item'

* added manufacturing date wise sort

* added prefix to expiry date and manufacturing date
 2018-02-12 14:33:40 +05:30
Britlog
be9a7231d4 Fix bootstrap layout and move checkout button upper (#12063) 2018-02-12 11:28:57 +05:30
rohitwaghchaure
7e75165826
Merge branch 'develop' into fixes_12829 2018-02-09 12:01:41 +05:30
pawan
081f40c1bf readded pos.css 2018-02-09 11:56:32 +05:30
pawan
1583120a54 remove pos.css 2018-02-08 20:00:12 +05:30
pawan
83b1b802d1 print hide and pos.less changes 2018-02-08 19:56:12 +05:30
pawan
735b8c6094 [fix] #12829 2018-02-08 16:20:46 +05:30
Saurabh
ab8c7e616e resolved merge conflicts 2018-02-08 15:17:15 +05:30
Faris Ansari
f7717b9ec2 get_party_account only if company is set 2018-02-08 11:11:21 +05:30
Prateeksha Singh
152bf37e7f
Merge pull request #12813 from pratu16x7/hub-fixes 
Hub listing and entity page
 2018-02-08 10:47:16 +05:30
Prateeksha Singh
4413ce1be1 company page, deprecate custom page 2018-02-07 23:50:01 +05:30
Nabin Hait
c224d34a2c Merge branch 'master' into develop 2018-02-07 16:07:20 +05:30
Rohit Waghchaure
e8d22bb999 [Fix] Incorrect change amount if enabled rounded total 2018-02-05 18:13:29 +05:30
Prateeksha Singh
3eaccffbd9 [hub] items searchable via core filters 2018-02-05 12:58:30 +05:30
Prateeksha Singh
b8e9c9be08 [hub] form (info) view for items 2018-02-05 12:58:30 +05:30
Faris Ansari
9b64620bc0 [hub] hub page using BaseList 2018-02-05 12:57:49 +05:30
rohitwaghchaure
441032d39c
Merge branch 'develop' into develop 2018-02-01 16:54:10 +05:30
Cesar
d8b1927e8d Allow no ZERO Payment 
Allow no ZERO Payment
 2018-01-29 15:39:52 +01:00
Saurabh
d581ff40ea Merge branch 'master' into develop 2018-01-29 17:42:37 +05:30
rohitwaghchaure
52beb77539 Don't validate payment terms for POS (#12692) 2018-01-29 17:40:44 +05:30
Saurabh
03f6b3e588 resolved merge conflicts 2018-01-29 16:25:33 +05:30
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685) 
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date

* Payment Terms patch for credit days defined in customer group
 2018-01-29 16:07:21 +05:30
Saurabh
fb2f97391f resolved merge conflicts 2018-01-24 11:24:10 +05:30
Rushabh Mehta
b5a3df920c [fix] primary button color for make 2018-01-23 16:08:52 +05:30
Saurabh
3959aeb848 [fix] parse value before setting it to dissable_rounded_total on Purchase Invoice 2018-01-23 15:40:43 +05:30
Maxwell Morais
7cffd618ab
Serial No, wont relates to the warehouse 
The serial no, picker wont follow the target serial no
 2018-01-22 22:33:28 -02:00
Saurabh
ef31637549 Merge branch 'master' into develop 2018-01-22 15:29:15 +05:30
Shreya
39adc8f85f calculate total when items are removed 2018-01-22 13:08:05 +05:30
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
rohitwaghchaure
c8e016522d
Merge pull request #12533 from rohitwaghchaure/pos_css_issue 
[Fix] POS css
 2018-01-18 16:12:00 +05:30
Rohit Waghchaure
5c4f52ccf1 [Fix] POS css 2018-01-18 16:10:19 +05:30
Nabin Hait
570e29d5e7 Fixed merge conflict 2018-01-17 18:56:02 +05:30
rohitwaghchaure
da941af687 Set due date in purchase invoice based on suppler invoice date (#12395) 2018-01-17 16:23:04 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale (#12514) 
* GL Entry on asset sale

* Asset sale test case fixed
 2018-01-17 14:39:05 +05:30
Saurabh
4b0dd8a159 Merge branch 'master' into develop 2018-01-15 18:36:35 +05:30
Nabin Hait
a2426fcc9e
Get default tax template only if tax template not selected or template is for other company (#12492) 2018-01-15 17:45:46 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
rohitwaghchaure
7b78f6bee6 Added rounded total in the POS and fix rounded issue in js side (#12457) 2018-01-12 16:28:16 +05:30
Saurabh
892a7a6980 resolved merge conflicts 2018-01-09 12:05:20 +05:30
tundebabzy
da22167741 Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382) 
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.

* ui test cases

* cleanup
 2018-01-09 10:58:44 +05:30
Sachin Mane
64f48db406 Batch number selector bug fix (#12346) 
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"
 2018-01-08 17:57:32 +05:30
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
tundebabzy
8f44d1c63d Payment Terms in Delivery Note #12167 (#12293) 
* add Payment Terms Template field to delivery note:
- This helps for users who create invoice from Sales Invoice
- Field is hidden in print
- Field is not coupled to Payment Schedule table.

* do nothing in payment_terms_template trigger if doctype is Delivery Note
 2018-01-05 12:46:50 +05:30
rohitwaghchaure
1f39feb12f [Fix] PO -> PI non default taxes not fetched (#12313) 2018-01-05 12:25:45 +05:30
Saurabh
14506d7878 Merge branch 'master' into develop 2018-01-02 12:09:25 +05:30
tundebabzy
650a1eeede recalculate terms when document date changed (#12288) 
* recalculate terms when document date changed

* clean up
 2018-01-02 12:02:30 +05:30
Javier Wong
2469095a13 Check Meta before Toggling Conversion Factor (#12237) 
If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.
 2017-12-29 14:06:47 +05:30
Vishal Dhayagude
f06c281964 [fix] allow to change doc status on get items (#12174) 2017-12-26 16:22:40 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
tundebabzy
590bd0a8e5 trigger payment_terms_template only when needed (#12124) 2017-12-25 11:40:19 +05:30
rohitwaghchaure
bd5e01b09b [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#12134) 2017-12-25 11:28:07 +05:30
rohitwaghchaure
1bc47fa43c [fix] Sales order tax not fetching on the sales invoice (#12055) 2017-12-16 10:49:58 +05:30
Vishal Dhayagude
d377018695 [fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001) 
* [wip] shipping rule

* [wip] Shipping Rule tax auto calculate

* [wip] Shipping Rule

* [new] Shipping charges change on different triggers

* [minor] Removed unnecessary comments

* [fix] Minor Changes in function calls
 2017-12-14 18:06:02 +05:30
rohitwaghchaure
2b95a5438b POS batch fixes (#12005) 2017-12-14 16:06:23 +05:30
rohitwaghchaure
24e5265281 [enhance] Search customer using primary contact mobile number (#11998) 
* [enhance] Search customer using primary contact mobile number

* Update build.json
 2017-12-14 13:06:21 +05:30
Ameya Shenoy
cc05c0b348 Agri fixes (#11988) 
* minor fixes in agri

* updated desktop.py

* [agri] fixed recreation of dotypes in setup.py

* setup_wizard changes

- converted agriculture from alpha to beta
- rearranged the domains alphabetically

* [agri] linked doctype is collapsible
 2017-12-13 18:50:39 +05:30
Nabin Hait
0f97eda7c9 Merge branch 'master' into develop 2017-12-12 19:17:53 +05:30
Nabin Hait
af9bdfeaa3
Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation (#11965) 2017-12-12 18:50:05 +05:30
Shreya Shah
db499dcaa4 fixed fiscal dates (#11939) 2017-12-12 14:19:35 +05:30
rohitwaghchaure
47749f4635 [fix] Cur_frm breaking offline pos (#11955) 2017-12-12 14:16:03 +05:30
rohitwaghchaure
efbc0667ec [fix] On change of payment terms template, not fetch respective schedule data (#11928) 2017-12-11 14:54:20 +05:30