diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index da689275ba3..56213c7cc71 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -4,6 +4,7 @@ "access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0 "access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0 "access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0 +"access_account_tax_internal_user","account.tax internal user","model_account_tax","base.group_user",1,0,0,0 "access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0 "access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0 "access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0 diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml index a7e4b400d76..86cdf97a2a3 100644 --- a/addons/crm/crm_meeting_data.xml +++ b/addons/crm/crm_meeting_data.xml @@ -23,7 +23,7 @@ - Case Meeting + Meeting crm.meeting diff --git a/addons/crm/scripts/php/countrylist.php b/addons/crm/scripts/php/countrylist.php index 857bda4fa9b..478947623c6 100644 --- a/addons/crm/scripts/php/countrylist.php +++ b/addons/crm/scripts/php/countrylist.php @@ -1,103 +1,105 @@ addParam(new xmlrpcval($db, "string")); - $msg->addParam(new xmlrpcval($user, "string")); - $msg->addParam(new xmlrpcval($pass, "string")); + include("xmlrpc.inc"); + + //Change to fit your configuration + $user = "admin"; + $password = "a"; + $db = "db_1"; + $serverUri = "http://localhost:8069/xmlrpc/"; + + + $client = new xmlrpc_client($serverUri.'common'); + + $msg = new xmlrpcmsg('login'); + $msg->addParam(new xmlrpcval($db, "string")); + $msg->addParam(new xmlrpcval($user, "string")); + $msg->addParam(new xmlrpcval($password, "string")); - $res = &$client->send($msg); + $res = &$client->send($msg); - if(!$res->faultCode()){ - - $id = $res->value()->scalarval(); + if(!$res->faultCode()){ + + $id = $res->value()->scalarval(); - $client = new xmlrpc_client($serverUri.'object'); + $client = new xmlrpc_client($serverUri.'object'); - $key = array(new xmlrpcval(array(new xmlrpcval("id", "string"), - new xmlrpcval(">", "string"), - new xmlrpcval(0, "int")),"array"),); - - - - $msg = new xmlrpcmsg('execute'); - $msg->addParam(new xmlrpcval($db, "string")); - $msg->addParam(new xmlrpcval($id, "int")); - $msg->addParam(new xmlrpcval($pass, "string")); - $msg->addParam(new xmlrpcval("res.country","string")); - $msg->addParam(new xmlrpcval("search", "string")); - $msg->addParam(new xmlrpcval($key, "array")); - $msg->addParam(new xmlrpcval(0, "int")); - $msg->addParam(new xmlrpcval(0, "int")); - $msg->addParam(new xmlrpcval("id ASC", "string")); - - $res = &$client->send($msg); + $key = array(new xmlrpcval(array(new xmlrpcval("id", "string"), + new xmlrpcval(">", "string"), + new xmlrpcval(0, "int")),"array"),); + + + + $msg = new xmlrpcmsg('execute'); + $msg->addParam(new xmlrpcval($db, "string")); + $msg->addParam(new xmlrpcval($id, "int")); + $msg->addParam(new xmlrpcval($password, "string")); + $msg->addParam(new xmlrpcval("res.country","string")); + $msg->addParam(new xmlrpcval("search", "string")); + $msg->addParam(new xmlrpcval($key, "array")); + $msg->addParam(new xmlrpcval(0, "int")); + $msg->addParam(new xmlrpcval(0, "int")); + $msg->addParam(new xmlrpcval("id ASC", "string")); + + $res = &$client->send($msg); - if(!$res->faultCode()) - { - $val = $res->value()->scalarval(); - - $ides = array(); - - for ($i=0 ; $iscalarval(), "int")); - } - - $client = new xmlrpc_client($serverUri.'object'); - - $fields = array(new xmlrpcval("code", "string"), new xmlrpcval("name", "string")); - - $msg = new xmlrpcmsg('execute'); - $msg->addParam(new xmlrpcval($db, "string")); - $msg->addParam(new xmlrpcval($id, "int")); - $msg->addParam(new xmlrpcval($pass, "string")); - $msg->addParam(new xmlrpcval("res.country","string")); - $msg->addParam(new xmlrpcval("read", "string")); - $msg->addParam(new xmlrpcval($ides, "array")); - $msg->addParam(new xmlrpcval($fields, "array")); + if(!$res->faultCode()) + { + $val = $res->value()->scalarval(); + + $ides = array(); + + for ($i=0 ; $iscalarval(), "int")); + } + + $client = new xmlrpc_client($serverUri.'object'); + + $fields = array(new xmlrpcval("code", "string"), new xmlrpcval("name", "string")); + + $msg = new xmlrpcmsg('execute'); + $msg->addParam(new xmlrpcval($db, "string")); + $msg->addParam(new xmlrpcval($id, "int")); + $msg->addParam(new xmlrpcval($password, "string")); + $msg->addParam(new xmlrpcval("res.country","string")); + $msg->addParam(new xmlrpcval("read", "string")); + $msg->addParam(new xmlrpcval($ides, "array")); + $msg->addParam(new xmlrpcval($fields, "array")); - $res = &$client->send($msg); - - if (!$res->faultCode()) - { - $val = $res->value()->scalarval(); - - $select =' + '; + + for ($i=0; $iscalarval(); + $select .= ''; + } + + $select .= ''; + + echo $select; + } + else + { + echo "Country not getting"; + } + } + else + { + echo "Country list id empty"; + } + } + else + { + echo "connection not establish"; + } - for ($i=0; $iscalarval(); - $select .= ''; - } - - $select .= ''; - - echo $select; - } - else - { - echo "Country not getting"; - } - } - else - { - echo "Country list id empty"; - } - } - else - { - echo "connection not establish"; - } - exit; ?> diff --git a/addons/crm/scripts/php/crmlead.php b/addons/crm/scripts/php/crmlead.php index 91cfe7649ed..12c43085a14 100644 --- a/addons/crm/scripts/php/crmlead.php +++ b/addons/crm/scripts/php/crmlead.php @@ -1,201 +1,155 @@ to = $to; - $this->subject = $sub; - } - - function mailTo($post) - { - if (!empty($post)) - { - - if (empty($this->to)) - { - $this->to = 'sales@tinyerp.com'; - } - - if (empty($this->subject)) - { - $this->subject = 'Contact form information'; - } + private $subject = '', $to = ''; + + function __construct($to, $sub) + { + $this->to = $to; + $this->subject = $sub; + } + - $body = ' - - - - - '; - - foreach ($post as $key => $value) - { - $body .= " - - - - "; - } - - $body .= '
$key:$value
'; - - $header = 'MEME-version : 1.0'."\r\n"; - $header .= 'Content-type: text/html; charset=iso-8859-1'."\r\n"; - $header .= 'From: '.$post['name'].' <'.$post['email'].'>'."\r\n"; - $header .= 'Reply-To: '.$post['name'].' <'.$post['email'].'>'."\r\n"; - $header .= 'Return-Path: '.$post['name'].' <'.$post['email'].'>'."\r\n"; - - if (mail($this->to, $this->subject, $body, $header)) - { - echo "

Thank You, Your information has been successfully submitted.


We will be in touch very soon.

"; - - } - else - { - echo "

Sorry, Due to some problem Your information has not been submitted.

"; - } - - } - } - - function xmlCallTo($usr, $password, $database, $server, $post) - { - $user = $usr; - $pass = $password; - $db = $database; - $server_url = $server; //'http://localhost:8069/xmlrpc/' - - $client = new xmlrpc_client($server_url.'common'); - - $msg = new xmlrpcmsg('login'); - $msg->addParam(new xmlrpcval($db, "string")); - $msg->addParam(new xmlrpcval($user, "string")); - $msg->addParam(new xmlrpcval($pass, "string")); + function xmlCallTo($usr, $password, $database, $server, $post) + { + $user = $usr; + $pass = $password; + $db = $database; + $server_url = $server; //'http://localhost:8069/xmlrpc/' + + $client = new xmlrpc_client($server_url.'common'); + + $msg = new xmlrpcmsg('login'); + $msg->addParam(new xmlrpcval($db, "string")); + $msg->addParam(new xmlrpcval($user, "string")); + $msg->addParam(new xmlrpcval($pass, "string")); - $res = &$client->send($msg); - - if(!$res->faultCode()){ - - $val = $res->value(); - $id = $val->scalarval(); + $res = &$client->send($msg); + + if(!$res->faultCode()){ + + $val = $res->value(); + $id = $val->scalarval(); - if (empty($id)){ - - echo "Connection error = "; - exit; - } - else - { - $client2 = new xmlrpc_client($server_url.'object'); + if (empty($id)){ + + echo "Connection error = "; + exit; + } + else + { + $client2 = new xmlrpc_client($server_url.'object'); + $key = array(new xmlrpcval(array(new xmlrpcval("code", "string"), new xmlrpcval("=", "string"), new xmlrpcval($post['country'], "string")),"array"),); + $msg = new xmlrpcmsg('execute'); + $msg->addParam(new xmlrpcval($db, "string")); + $msg->addParam(new xmlrpcval($id, "int")); + $msg->addParam(new xmlrpcval($pass, "string")); + $msg->addParam(new xmlrpcval("res.country","string")); + $msg->addParam(new xmlrpcval("search", "string")); + $msg->addParam(new xmlrpcval($key, "array")); + $msg->addParam(new xmlrpcval(0, "int")); + $msg->addParam(new xmlrpcval(1, "int")); + + $res = &$client2->send($msg); + + $val = $res->value()->scalarval(); + + $countryId = $val[0]->scalarval(); + + $val = array ("name" => new xmlrpcval($post['company'],"string"), + "email_from" => new xmlrpcval($post['email'], "string"), + "phone" => new xmlrpcval($post['phone'], "string"), + "partner_name" => new xmlrpcval($post['name'], "string"), + "function" => new xmlrpcval($post["jobtitle"], "string"), + "zip" => new xmlrpcval($post['zip'], "string"), + "stage_id" => new xmlrpcval(2, "int"), + "city" => new xmlrpcval($post['city'], "string"), + "country_id" => new xmlrpcval($countryId, "int"), + "state" => new xmlrpcval("draft", "string"), + "user_id" => new xmlrpcval(false, "boolean"), + "description" => new xmlrpcval("No.of Employees: ".$post['employees']."\nState: ".$post['state']."\nIndustry: ".$post['industry']."\nAbout: ".$post['about'], "string") + ); + + $msg = new xmlrpcmsg('execute'); + $msg->addParam(new xmlrpcval($db, "string")); + $msg->addParam(new xmlrpcval($id, "int")); + $msg->addParam(new xmlrpcval($pass, "string")); + $msg->addParam(new xmlrpcval("crm.lead", "string")); + $msg->addParam(new xmlrpcval("create", "string")); + $msg->addParam(new xmlrpcval($val, "struct")); + + + $res2 = &$client2->send($msg); + + if(!$res2->faultCode()) + { + $readVal = $res2->value()->scalarval(); + + if (!empty($readVal)) + { + $val = array ( "description" => new xmlrpcval("About: ".$post['about']), + "model_id" => new xmlrpcval(276, "int"), + "res_id" => new xmlrpcval($readVal,"int"), + "email_from" => new xmlrpcval($post['email'], "string"), + "email_to" => new xmlrpcval("sales@openerp.com", "string") + ); - $key = array(new xmlrpcval(array(new xmlrpcval("code", "string"), new xmlrpcval("=", "string"), new xmlrpcval($post['country'], "string")),"array"),); - $msg = new xmlrpcmsg('execute'); - $msg->addParam(new xmlrpcval($db, "string")); - $msg->addParam(new xmlrpcval($id, "int")); - $msg->addParam(new xmlrpcval($pass, "string")); - $msg->addParam(new xmlrpcval("res.country","string")); - $msg->addParam(new xmlrpcval("search", "string")); - $msg->addParam(new xmlrpcval($key, "array")); - $msg->addParam(new xmlrpcval(0, "int")); - $msg->addParam(new xmlrpcval(1, "int")); - - $res = &$client2->send($msg); - - $val = $res->value()->scalarval(); - - $countryId = $val[0]->scalarval(); - - $val = array ("name" => new xmlrpcval($post['company'],"string"), - "title" => new xmlrpcval($post['salutation'], "string"), - "email_from" => new xmlrpcval($post['email'], "string"), - "phone" => new xmlrpcval($post['phone'], "string"), - "partner_name" => new xmlrpcval($post['name'], "string"), - "function" => new xmlrpcval($post["jobtitle"], "string"), - "zip" => new xmlrpcval($post['zip'], "string"), - "stage_id" => new xmlrpcval(6, "int"), - "city" => new xmlrpcval($post['city'], "string"), - "country_id" => new xmlrpcval($countryId, "int"), - "state" => new xmlrpcval("draft", "string"), - "user_id" => new xmlrpcval(false, "boolean"), - "description" => new xmlrpcval("No.of Employees: ".$post['employees']."\nState: ".$post['state']."\nIndustry: ".$post['industry']."\nReasons: ".$post['reasons']."\nAbout: ".$post['about']."\nQuestions: ".stripslashes($post['questions'])."\nUpdate: ".$post['update'], "string") - ); - - $msg = new xmlrpcmsg('execute'); - $msg->addParam(new xmlrpcval($db, "string")); - $msg->addParam(new xmlrpcval($id, "int")); - $msg->addParam(new xmlrpcval($pass, "string")); - $msg->addParam(new xmlrpcval("crm.lead", "string")); - $msg->addParam(new xmlrpcval("create", "string")); - $msg->addParam(new xmlrpcval($val, "struct")); - - - $res2 = &$client2->send($msg); - - if(!$res2->faultCode()) - { - $readVal = $res2->value()->scalarval(); - - if (!empty($readVal)) - { - $val = array ( "description" => new xmlrpcval("About: ".$post['about']."\nQuestions: ".$post['questions']), - "model_id" => new xmlrpcval(276, "int"), - "res_id" => new xmlrpcval($readVal,"int"), - "email_from" => new xmlrpcval($post['email'], "string"), - "email_to" => new xmlrpcval("sales@openerp.com", "string") - ); + + $msg = new xmlrpcmsg('execute'); + $msg->addParam(new xmlrpcval($db, "string")); + $msg->addParam(new xmlrpcval($id, "int")); + $msg->addParam(new xmlrpcval($pass, "string")); + $msg->addParam(new xmlrpcval("crm.case.history", "string")); + $msg->addParam(new xmlrpcval("create", "string")); + $msg->addParam(new xmlrpcval($val, "struct")); + + $res2 = &$client2->send($msg); - - $msg = new xmlrpcmsg('execute'); - $msg->addParam(new xmlrpcval($db, "string")); - $msg->addParam(new xmlrpcval($id, "int")); - $msg->addParam(new xmlrpcval($pass, "string")); - $msg->addParam(new xmlrpcval("crm.case.history", "string")); - $msg->addParam(new xmlrpcval("create", "string")); - $msg->addParam(new xmlrpcval($val, "struct")); - - $res2 = &$client2->send($msg); - - //echo "
Successfully created lead"; - echo "

Thank You for your interest in openerp, we'll respond to your request shortly.


"; - if(strstr($post["about"],"Book")) { - echo ''; - } - } - else - { - echo "
Lead is not created"; - } - } - else - { - echo "
Problem in message sending for create lead"; - } - } - } - else - { - echo "
Connection not established"; - } - } + //echo "
Successfully created lead"; + echo "

Thank You for your interest in openerp, we'll respond to your request shortly.


"; + if(strstr($post["about"],"Book")) { + echo ''; + } + } + else + { + echo "
Lead is not created"; + } + } + else + { + echo "
Problem in message sending for create lead"; + } + } + } + else + { + echo "
Connection not established"; + } + } } - $arrData = array(); - $arrData = array_merge($arrData, (array)$_POST); - - $cnt = new Contact('sales5@openerp.com', 'Country: '.$arrData['country']. ' About: ' .$arrData['about']); - - /* This function use for sending mail on perticular mail account */ - /*$cnt->mailTo($arrData); */ - - /* This function use ceating lead in crm of opener erp database */ - $cnt->xmlCallTo('', '', '', '', $arrData); - - exit; + if(isset($_POST['country']) && $_POST['country'] != '') { + $arrData = array(); + $arrData = array_merge($arrData, (array)$_POST); + + $cnt = new Contact('sales5@openerp.com', 'Country: '.$arrData['country']. ' About: ' .$arrData['about']); + + /* This function use for sending mail on perticular mail account */ + /*$cnt->mailTo($arrData); */ + + /* This function use ceating lead in crm of opener erp database */ + //Change to fit your configuration + $cnt->xmlCallTo('admin', 'a', 'db_1', 'http://localhost:8069/xmlrpc/', $arrData); + } + else { + echo 'please fill the form at form.php'; + } + + exit; ?> + diff --git a/addons/crm/scripts/php/form.php b/addons/crm/scripts/php/form.php new file mode 100644 index 00000000000..2d255e87cb3 --- /dev/null +++ b/addons/crm/scripts/php/form.php @@ -0,0 +1,74 @@ + + +Contact form + + +

Contact Form

+
+ +
+ +
+ +
+ +
+ + + + +
+ +
+
+
+ + +
+ + +
+

+ +

+

+ +

+
+ + + + + + + + + diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 25eb56673b0..cf491f0d0e6 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -45,7 +45,7 @@ id="menu_mrp_configuration" name="Configuration" parent="base.menu_mrp_root" - groups="base.group_extended" + groups="group_mrp_manager" sequence="50" /> @@ -664,7 +664,7 @@ - + diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index dcbf6c866b4..c3b932e6129 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -5,6 +5,9 @@ "access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0 "access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0 "access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1 +"access_mrp_production_salesman","mrp.production salesman","model_mrp_production","base.group_sale_salesman",1,1,1,0 +"access_mrp_production_product_line_salesman","mrp.production.product.line salesman","model_mrp_production_product_line","base.group_sale_salesman",1,0,1,0 +"access_mrp_production_workcenter_line_salesman","mrp.production.workcenter.line salesman","model_mrp_production_workcenter_line","base.group_sale_salesman",1,0,1,0 "access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1 "access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1 @@ -12,7 +15,7 @@ "access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1 -"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,1 +"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1 "access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1 "access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0 "access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0 @@ -32,8 +35,8 @@ "access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0 "access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1 "access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1 -"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,1,1,1 -"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,1,1,1 +"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,0,0,0 +"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,0,0,0 "access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,1,1,1 "access_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_user",1,1,1,1 "access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,1,1,1 diff --git a/addons/pad/web/editors.py b/addons/pad/web/editors.py index ef24cbfbc12..689ec48ed1a 100644 --- a/addons/pad/web/editors.py +++ b/addons/pad/web/editors.py @@ -14,7 +14,7 @@ class SidebarTemplateEditor(openobject.templating.TemplateEditor): output.index(self.ADD_ATTACHMENT_BUTTON)) + 1 output = output[:form_opener_insertion] + \ '''${_("Pad")}\n''' + \ output[form_opener_insertion:] return output diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 96b96f3af21..2cc3b4c199f 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -265,7 +265,7 @@ - + diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv index 382543c9df4..a09115daecf 100644 --- a/addons/procurement/security/ir.model.access.csv +++ b/addons/procurement/security/ir.model.access.csv @@ -2,7 +2,7 @@ "access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0 "access_procurement_stock_manager","procurement.order stock.manager","model_procurement_order","stock.group_stock_manager",1,1,1,1 "access_procurement_stock_user","procurement.order stock.user","model_procurement_order","stock.group_stock_user",1,1,1,1 -"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,1,1,1 +"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,0,0,0 "access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1 "access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1 "access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1 diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 693452d4e09..966c5795b52 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -20,7 +20,7 @@ "access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","group_purchase_manager",1,0,0,0 "access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0 "access_product_product_purchase_manager","product.product.purchase.manager","product.model_product_product","group_purchase_manager",1,0,0,0 -"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,1,1,1 +"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,0,0,0 "access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","group_purchase_manager",1,0,0,0 "access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1 "access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1 diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 5f5e84f4ac0..91492532acc 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -215,10 +215,10 @@ [[ o.state <> 'draft' and removeParentNode('para') ]] Quotation Date - Our Salesman + Salesman - Payment Terms + Payment Term diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8dd4370f75f..e3e9f6c599b 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -257,7 +257,7 @@ class sale_order(osv.osv): }, multi='sums', help="The total amount"), - 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True), + 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True, readonly=True, states={'draft': [('readonly', False)]}), 'payment_term': fields.many2one('account.payment.term', 'Payment Term'), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'), 'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True) diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 39b1996ee88..e41f87cce79 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,1,0,0 +"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1 "access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0 @@ -33,7 +33,7 @@ "access_account_fiscalyear_manager","account.fiscalyear.manager","account.model_account_fiscalyear","base.group_sale_manager",1,0,0,0 "access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,0,0,0 "access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0 -"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,0 +"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,0,0,0 "access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,0 "access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,0 "access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1 diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index e1a22e9fb69..2fd32112448 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -4,7 +4,7 @@ "access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0 "access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,0,0,0 -"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,1,1,1 +"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0 "access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0 "access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1 "access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1 @@ -29,7 +29,7 @@ "access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1 "access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1 "access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1 -"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,1,1,1 -"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,1,1,1 +"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,0,0,0 +"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,0,0,0 "access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0 "access_product_template_stock_manager","product.template stock manager","product.model_product_template","stock.group_stock_manager",1,0,0,0 diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 7637615727b..f7dd717432c 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -606,7 +606,7 @@ class stock_picking(osv.osv): "Set a location if you produce at a fixed location. This can be a partner location " \ "if you subcontract the manufacturing operations.", select=True), 'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products.", select=True), - 'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"), + 'move_type': fields.selection([('direct', 'Partial Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"), 'state': fields.selection([ ('draft', 'Draft'), ('auto', 'Waiting'), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index eeb0a92d019..f3780d23e03 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -152,8 +152,8 @@