Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,994 Commits 36 Branches 189 Tags
75845a990f6d33f74d39173faca5428cbc08e7f9
Commit Graph

14595 Commits

Author SHA1 Message Date
Laurent Destailleur
75845a990f FIX Missing province in export of invoice 2019-02-01 22:55:28 +01:00
Laurent Destailleur
dee2a373c1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2019-02-01 16:01:18 +01:00
Laurent Destailleur
14dea53700 FIX Missing field in import/export of users 2019-01-31 15:51:02 +01:00
gauthier
09ba059c21 FIX : need an order by in case we found other invoice with same number but not same date 2019-01-31 11:03:06 +01:00
Laurent Destailleur
81ae4c52c5 Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
gauthier
9490929216 FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled 2019-01-30 10:49:32 +01:00
gauthier
412940b5ca FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled 2019-01-30 10:19:13 +01:00
Laurent Destailleur
c6755b3cf1 Fix formatting of number in quantity field 2019-01-29 15:59:41 +01:00
Pierre Ardoin
80cfe86508 Update objectline_view.tpl.php 2019-01-29 14:26:14 +01:00
Pierre Ardoin
5ea1cf0775 Update objectline_edit.tpl.php 2019-01-29 14:25:34 +01:00
Pierre Ardoin
b6df02e795 Correction oubli date de livraison 
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
 2019-01-29 11:47:39 +01:00
Pierre Ardoin
dd0f6b3829 Edition Ligne Travaux Supplémentaires 
Correction pour permettre l'édition si la ligne n'existe pas dans une précédente situation. Permet l'édition d'une ligne si elle a été ajouté dans la situation actuelle.
 2019-01-29 11:30:14 +01:00
Pierre Ardoin
508fb5c9cb Prise en charge des Travaux supplémentaires 
Corrige la filtration lors des situations client afin de prendre en compte la possibilité d'ajouter des travaux en cours de chantier.
 2019-01-29 11:13:11 +01:00
Laurent Destailleur
5ab6c41dfa Fix missing multicurrency fields in export 2019-01-21 02:43:08 +01:00
wdammak
aaa61254ac Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:36:09 +01:00
wdammak
191900d258 Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:35:16 +01:00
Regis Houssin
7c9d85d091 FIX problem with multicompany transverse mode 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2019-01-15 12:18:04 +01:00
Laurent Destailleur
0d9367b09d Merge pull request #10305 from tuxgasy/8.0_bill_orders 
Fix #10301 mass bill orders
 2019-01-08 16:50:48 +01:00
Laurent Destailleur
a1f5ede736 Update actions_massactions.inc.php 2019-01-08 16:50:27 +01:00
Laurent Destailleur
47448b77f0 Update actions_massactions.inc.php 2019-01-08 16:47:30 +01:00
TuxGasy
2c2f86736a Fix #10301 mass bill orders and replicate extrafields 2019-01-08 15:59:20 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
Laurent Destailleur
9d8b084115 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/core/actions_sendmails.inc.php
	htdocs/filefunc.inc.php
 2019-01-08 01:48:54 +01:00
Juanjo Menent
7908550937 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-05 13:05:50 +01:00
Ferran Marcet
f3dd875fc7 FIX: Can't generate invoice pdf 2019-01-04 12:00:39 +01:00
Ferran Marcet
4694af0488 FIX: Can't generate invoice pdf 2019-01-04 11:45:02 +01:00
Ferran Marcet
3e358c90b3 Merge branch '7.0up' into 7.0 2019-01-04 11:32:19 +01:00
Ferran Marcet
15cc45b8ae FIX: Can't generate invoice pdf 2019-01-04 10:52:10 +01:00
ldestailleur
3d8479291d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-02 19:39:35 +01:00
ldestailleur
8645a7f524 FIX Interface regression for bind people. Fix option 
MAIN_OPTIMIZEFORTEXTBROWSER
 2019-01-02 18:58:45 +01:00
Juanjo Menent
cf64053fa5 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-12-29 15:07:09 +01:00
Laurent Destailleur
94ee18a20a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-22 19:00:15 +01:00
Laurent Destailleur
8d39edf430 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2018-12-22 18:59:49 +01:00
Regis Houssin
09ce84ca93 FIX avoid Class 'AdherentType' not found 2018-12-21 16:38:02 +01:00
Regis Houssin
9b215e117a FIX check if "entity" is already defined in "$param" 2018-12-21 11:23:44 +01:00
Laurent Destailleur
2978522006 Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change 
FIX: contact/address tab issue when changing company
 2018-12-19 12:59:32 +01:00
Laurent Destailleur
4b7f373802 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/project/doc/pdf_baleine.modules.php
	htdocs/core/modules/project/doc/pdf_beluga.modules.php
 2018-12-18 21:35:30 +01:00
Laurent Destailleur
4b6ae9d424 FIX Error reported when creation of thirdparty from member fails 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
 2018-12-18 21:32:41 +01:00
Laurent Destailleur
6851232314 Fix removing constant no more required 2018-12-18 21:29:36 +01:00
Laurent Destailleur
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Laurent Destailleur
2e6a41228f Fix removing constant no more required 2018-12-18 20:49:48 +01:00
Marc de Lima Lucio
7e2eca661b FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account 2018-12-18 09:40:58 +01:00
Laurent Destailleur
063e589a1b Merge branch '8.0' into 8.0_fix9964 2018-12-14 19:37:40 +01:00
Laurent Destailleur
ea35e45f76 Merge pull request #10197 from atm-maxime/fix_import_bank 
Fix unexistant fields
 2018-12-14 17:40:45 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
florian HENRY
2e57a8be51 better fix 2018-12-13 12:37:40 +01:00
florian HENRY
56923caeec Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-13 12:34:39 +01:00