Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
957e797b61
@ -127,7 +127,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'99','Perso
|
||||
|
||||
-- Belgium
|
||||
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '200', 'Indépendant');
|
||||
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '201', 'SPRL - Société à responsabilité limitée');
|
||||
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '201', 'SRL - Société à responsabilité limitée');
|
||||
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '202', 'SA - Société Anonyme');
|
||||
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '203', 'SCRL - Société coopérative à responsabilité limitée');
|
||||
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '204', 'ASBL - Association sans but Lucratif');
|
||||
|
||||
@ -123,3 +123,5 @@ ALTER TABLE llx_accounting_account ADD COLUMN labelshort varchar(255) DEFAULT NU
|
||||
|
||||
ALTER TABLE llx_subscription ADD COLUMN fk_user_creat integer DEFAULT NULL;
|
||||
ALTER TABLE llx_subscription ADD COLUMN fk_user_valid integer DEFAULT NULL;
|
||||
|
||||
UPDATE llx_c_forme_juridique set libelle = 'SRL - Société à responsabilité limitée' WHERE code = '201';
|
||||
|
||||
@ -117,7 +117,7 @@ class ActionsMyModule
|
||||
|
||||
|
||||
/**
|
||||
* Overloading the doActions function : replacing the parent's function with the one below
|
||||
* Overloading the doMassActions function : replacing the parent's function with the one below
|
||||
*
|
||||
* @param array $parameters Hook metadatas (context, etc...)
|
||||
* @param CommonObject $object The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user