These are the updates I made today: root@braserv:/srv/dolibarr# git fetch remote: Counting objects: 60, done. remote: Compressing objects: 100% (48/48), done. remote: Total 60 (delta 53), reused 19 (delta 12), pack-reused 0 Unpacking objects: 100% (60/60), done. >From https://github.com/Dolibarr/dolibarr 486a372..f78cf68 develop -> origin/develop root@braserv:/srv/dolibarr# git merge Updating 486a372..f78cf68 Fast-forward htdocs/adherents/card.php | 16 ++-------------- htdocs/core/class/commonobject.class.php | 22 ++++++++++++++++------ htdocs/core/class/extrafields.class.php | 26 +++++++++++++------------- htdocs/core/tpl/admin_extrafields_edit.tpl.php | 2 +- htdocs/install/mysql/migration/7.0.0-8.0.0.sql | 2 ++ htdocs/install/mysql/tables/llx_extrafields.sql | 2 +- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/en_US/agenda.lang | 2 +- htdocs/langs/en_US/bills.lang | 8 ++++---- htdocs/langs/en_US/cron.lang | 4 ++-- htdocs/langs/en_US/main.lang | 4 ++-- htdocs/public/members/new.php | 27 ++++++++++----------------- htdocs/societe/class/companypaymentmode.class.php | 5 +++-- htdocs/ticketsup/class/actions_ticketsup.class.php | 2 +- htdocs/ticketsup/class/ticketsup.class.php | 24 ++++++++++++------------ htdocs/ticketsup/list.php | 8 ++++---- 16 files changed, 75 insertions(+), 81 deletions(-) root@braserv:/srv/dolibarr# rm ../documents-dolibarr/install.lock root@braserv:/srv/dolibarr# touch ../documents-dolibarr/install.lock root@braserv:/srv/dolibarr# git fetch remote: Counting objects: 6, done. remote: Compressing objects: 100% (1/1), done. remote: Total 6 (delta 5), reused 6 (delta 5), pack-reused 0 Unpacking objects: 100% (6/6), done. >From https://github.com/Dolibarr/dolibarr f78cf68..28d8acb develop -> origin/develop root@braserv:/srv/dolibarr# git merge Updating f78cf68..28d8acb Fast-forward htdocs/modulebuilder/template/myobject_list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
On Tue, Apr 10, 2018 at 10:18 PM, Sasa Ostrouska <cas...@gmail.com> wrote: > Hi I just updated to the latest git tree today: > > root@braserv:/srv/dolibarr# git merge > Updating f78cf68..28d8acb > Fast-forward > htdocs/modulebuilder/template/myobject_list.php | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > root@braserv:/srv/dolibarr# > > Creating a new product I get the following RED error: > > Erro : Cannot add or update a child row: a foreign key constraint fails > (`banco_dolibarr`.`llx_product`, CONSTRAINT > `fk_product_default_warehouse` FOREIGN KEY (`fk_default_warehouse`) > REFERENCES `llx_entrepot` (`rowid`)) - UPDATE llx_product SET label = > '140-0983HD', ref = 'BT-1400983HD-B', ref_ext = null, default_vat_code = > null, tva_tx = 0, recuperableonly = 0, localtax1_tx = 0, localtax2_tx = 0, > localtax1_type = '0', localtax2_type = '0', barcode = null, fk_barcode_type > = null, tosell = 1, tobuy = 1, tobatch = 0, finished = 1, weight = '26', > weight_units = '0', length = '914', length_units = '0', width= '203', > width_units = null, height = '19', height_units = null, surface = null, > surface_units = '0', volume = null, volume_units = '0', > fk_default_warehouse = -1, seuil_stock_alerte = null, description = 'LAMINA > RETA HD, 2CH, DIM.203x19x914, 6F DE 3/4"', url = null, customcode = > '84314200', fk_country = 56, note = '', duration = '', accountancy_code_buy > = '', accountancy_code_sell= '', accountancy_code_sell_intra= '', > accountancy_code_sell_export= '', desiredstock = null, cost_price = null, > fk_unit= NULL, price_autogen = 0, fk_price_expression = NULL, fk_user_modif > = 2 WHERE rowid = 840 > > Rgds > Saxa > >
_______________________________________________ Dolibarr-dev mailing list Dolibarr-dev@nongnu.org https://lists.nongnu.org/mailman/listinfo/dolibarr-dev
