Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

43ed4889

Commit 43ed4889 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql

parents 91f4fccb 1252a500

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 27 additions, 10 deletions

ChangeLog
build/makepack-dolibarr.pl 2 additions, 2 deletions

build/makepack-dolibarr.pl
htdocs/comm/mailing/class/mailing.class.php 24 additions, 1 deletion

htdocs/comm/mailing/class/mailing.class.php
htdocs/comm/propal/class/propal.class.php 14 additions, 3 deletions

htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php 13 additions, 4 deletions

htdocs/commande/class/commande.class.php
htdocs/core/class/commonobject.class.php 6 additions, 4 deletions

htdocs/core/class/commonobject.class.php
htdocs/core/modules/modCategorie.class.php 1 addition, 2 deletions

htdocs/core/modules/modCategorie.class.php
htdocs/expedition/class/expedition.class.php 3 additions, 2 deletions

htdocs/expedition/class/expedition.class.php
htdocs/expedition/tpl/linkedobjectblock.tpl.php 2 additions, 1 deletion

htdocs/expedition/tpl/linkedobjectblock.tpl.php
htdocs/fourn/class/fournisseur.product.class.php 1 addition, 0 deletions

htdocs/fourn/class/fournisseur.product.class.php
htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php 2 additions, 1 deletion

htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php 2 additions, 1 deletion

htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql 33 additions, 32 deletions

htdocs/install/mysql/migration/3.6.0-3.7.0.sql
scripts/product/migrate_picture_path.php 148 additions, 0 deletions

scripts/product/migrate_picture_path.php

with 278 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment