Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
75,225 Commits 36 Branches 190 Tags
cfa414b2de51c08ad9c110bf7a0a3d7b51d3a093
Commit Graph

16687 Commits

Author SHA1 Message Date
Laurent Destailleur
f955f3f4ee Fix report error only if return code < 0 2019-01-30 12:23:34 +01:00
Alexandre SPANGARO
84ecfd96fb Update example 2019-01-30 11:22:01 +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
Alexandre SPANGARO
1b675ba0b6 FIX: FEC Compatibility for import in ledger 2019-01-30 09:51:29 +01:00
wdammak
84d2bcce4f Update eldy.lib.php 
Fix Travis
 2019-01-29 22:08:18 +01:00
wdammak
f3c725f40f Update eldy.lib.php 
fix travis
 2019-01-29 21:36:52 +01:00
wdammak
c18a8bef1b Update eldy.lib.php 
Simplifying horizontal menu writing, it would simplify menu updates in the future.
The menu table can be further simplified, it's in a 2nd step if @eldy confirms this restructuring.
Already tested and it works.
 2019-01-29 19:44:59 +01:00
Laurent Destailleur
cedf1bb269 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-01-29 19:13:57 +01:00
Laurent Destailleur
205b7f2e95 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-29 19:04:40 +01:00
Laurent Destailleur
3d218cadb7 FIX last_main_doc var not saved 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-01-29 19:03:45 +01:00
Laurent Destailleur
9ef93bceca FIX last_main_doc var not saved 2019-01-29 18:40:47 +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
ptibogxiv
a3b648824a ADD payout link 2019-01-29 14:12:35 +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
08a181bfbf Fix substitution of REF_CLIENT and REF_SUPPLIER 2019-01-29 11:00:17 +01:00
Laurent Destailleur
43c0a2232c Fix massaction 2019-01-29 10:51:34 +01:00
Laurent Destailleur
77e322b250 Fix bad var 2019-01-29 10:49:51 +01:00
Laurent Destailleur
c84b189a05 Fix duplicate recording of event when using mass action send 2019-01-29 10:49:01 +01:00
Laurent Destailleur
f6be0f7686 Fix duplicate log when using mass action email send 2019-01-29 10:48:45 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
77747ac2a3 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-28 16:35:12 +01:00
wdammak
388efb6773 Wrapping for stock movements 2019-01-28 04:36:26 +01:00
Frédéric FRANCE
26dea99375 Update box_task.php 2019-01-28 00:07:38 +01:00
Frédéric FRANCE
764a928cd6 wip 2019-01-27 23:48:36 +01:00
Frédéric FRANCE
ff39491f15 wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
46bc078481 Fix phpcs 2019-01-27 23:10:10 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2019-01-27 18:27:58 +01:00
Laurent Destailleur
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
a268a13c89 Merge pull request #10423 from grandoc/new_branch_27_01_2019 
fix translations
 2019-01-27 17:55:05 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Philippe GRAND
b8ec33d29b fix translations 2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Philippe GRAND
95bbb46fdf fix translations 2019-01-27 12:20:24 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Philippe GRAND
a6c40dc867 fix translations 2019-01-27 11:37:57 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Frédéric FRANCE
46b6d16210 correct menu 2019-01-27 09:17:01 +01:00
Laurent Destailleur
462c1f9c1a Merge pull request #10413 from mapiolca/patch-8 
Add date_livraison substitution
 2019-01-26 15:38:00 +01:00
Pierre Ardoin
6fdbded588 Update functions.lib.php 2019-01-26 14:40:00 +01:00
Laurent Destailleur
fd192f10c4 Merge pull request #10341 from hregis/8.0_bug 
FIX security broken with Multicompany
 2019-01-26 14:28:13 +01:00
Laurent Destailleur
b4400b95db Merge pull request #10411 from BitKFu/develop 
Added new calculation fields for the doc generator
 2019-01-26 14:17:43 +01:00
Laurent Destailleur
c989b8d102 Update commondocgenerator.class.php 2019-01-26 14:17:01 +01:00
Pierre Ardoin
78f8607d41 Add date_livraison substitution 
Complete the substitution for supplier orders.
 2019-01-25 13:15:24 +01:00