From e752e771e5212ddd4a0217b723ef99c3264e636c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 29 Aug 2013 15:14:37 +0530 Subject: [PATCH 01/18] [communications] [minor] Code cleanup so it can be extended by custom script --- website/css/website.css | 1 + 1 file changed, 1 insertion(+) diff --git a/website/css/website.css b/website/css/website.css index 88bf7fd3183..015e500d31f 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -56,6 +56,7 @@ img { div.web-footer { padding-top: 10px; + padding-bottom: 20px; } .web-footer-menu ul { From e89c533eaaa5feedefe1190b1d67e0be1f46b733 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 29 Aug 2013 15:32:46 +0530 Subject: [PATCH 02/18] [sales/purchase] [minor] Set tax table on insert if tax master set, but table missing --- controllers/buying_controller.py | 3 ++- controllers/selling_controller.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/buying_controller.py b/controllers/buying_controller.py index 63244c5fcec..043099a70df 100644 --- a/controllers/buying_controller.py +++ b/controllers/buying_controller.py @@ -17,7 +17,6 @@ class BuyingController(StockController): def onload_post_render(self): # contact, address, item details self.set_missing_values() - self.set_taxes("purchase_tax_details", "purchase_other_charges") def validate(self): super(BuyingController, self).validate() @@ -40,6 +39,8 @@ class BuyingController(StockController): self.doc.fields[fieldname] = val self.set_missing_item_details(get_item_details) + if self.doc.fields.get("__islocal"): + self.set_taxes("purchase_tax_details", "purchase_other_charges") def set_supplier_from_item_default(self): if self.meta.get_field("supplier") and not self.doc.supplier: diff --git a/controllers/selling_controller.py b/controllers/selling_controller.py index 086c42e3981..4b4b1c71a3c 100644 --- a/controllers/selling_controller.py +++ b/controllers/selling_controller.py @@ -14,15 +14,15 @@ class SellingController(StockController): def onload_post_render(self): # contact, address, item details and pos details (if applicable) self.set_missing_values() - self.set_taxes("other_charges", "charge") def set_missing_values(self, for_validate=False): super(SellingController, self).set_missing_values(for_validate) # set contact and address details for customer, if they are not mentioned self.set_missing_lead_customer_details() - self.set_price_list_and_item_details() + if self.doc.fields.get("__islocal"): + self.set_taxes("other_charges", "charge") def set_missing_lead_customer_details(self): if self.doc.customer: From cf90b6f3aee7f1f20132c1641b5824004ea54bac Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 29 Aug 2013 19:01:34 +0530 Subject: [PATCH 03/18] [communication] [minor] ignore status updates for support tickets --- website/css/website.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/website/css/website.css b/website/css/website.css index 015e500d31f..68fd7440069 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -18,10 +18,6 @@ img { padding-bottom: 30px; } -.outer { - padding: 0px 20px; -} - .navbar { margin: 0px -20px; } From f55631a51aed35b51cd6cfdfd3855cf07dbfdcbb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 29 Aug 2013 22:12:17 +0530 Subject: [PATCH 04/18] [website] [style] [minor] Navbar goes out --- website/templates/html/outer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html index 0f0f4002ea1..462f4dd7969 100644 --- a/website/templates/html/outer.html +++ b/website/templates/html/outer.html @@ -1,6 +1,7 @@ {% extends "lib/templates/base.html" %} {% block body %} + {% include "app/website/templates/html/navbar.html" %}
{% if shopping_cart_enabled -%} @@ -23,7 +24,6 @@
{{ banner_html }}
{% endif %}
- {% include "app/website/templates/html/navbar.html" %}
{%- block content -%} {%- endblock -%} From 010de37fcbb0e5a08c6b6327240a72c1ea88990b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 29 Aug 2013 22:28:58 +0530 Subject: [PATCH 05/18] [website] [style] [minor] padding in blog categories --- utilities/demo/demo-login.html | 2 +- website/templates/html/blog_footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/demo/demo-login.html b/utilities/demo/demo-login.html index ef24678e27a..4595cb7d355 100644 --- a/utilities/demo/demo-login.html +++ b/utilities/demo/demo-login.html @@ -8,7 +8,7 @@

+ class="form-control" placeholder="Your Email Id (optional)">