Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-01 14:42:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,930 Commits 37 Branches 191 Tags
d9ce99a314ff47ecb019109bbaf3edc8dda983cb
Commit Graph

63751 Commits

Author SHA1 Message Date
Philippe GRAND
d9ce99a314 update with html5 compliant code 2019-01-30 19:41:56 +01:00
Philippe GRAND
a0e87fbfd2 update with html5 compliant code 2019-01-30 19:38:04 +01:00
Philippe GRAND
e12f66e3d9 update with html5 compliant code 2019-01-30 19:34:33 +01:00
Philippe GRAND
06055ed586 update with html5 compliant code 2019-01-30 19:32:08 +01:00
Laurent Destailleur
2882f45bca Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-30 18:55:01 +01:00
Laurent Destailleur
f67937c59d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 18:54:29 +01:00
Laurent Destailleur
ae1c4e065b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-30 18:53:56 +01:00
Laurent Destailleur
231395dab8 Merge pull request #10398 from atm-john/fix_trigger 
Fix missing trigger
 2019-01-30 18:53:10 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
1b8a873987 Merge pull request #10434 from frederic34/patch-17 
The variable $i does not seem to be defined for all execution paths
 2019-01-30 16:49:16 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
41e20a9d4f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-30 16:44:08 +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
Laurent Destailleur
d0b20178e0 Merge pull request #10442 from aspangaro/10.0_accountancy_default 
NEW: When you create product or service, sell accountancy account by default are proposed
 2019-01-30 16:30:13 +01:00
Laurent Destailleur
7983a85bb2 Update accountancy.lang 2019-01-30 16:29:45 +01:00
Laurent Destailleur
97248a830b FIX #10440 2019-01-30 16:28:37 +01:00
Laurent Destailleur
6d992a6d7b FIX #10440 2019-01-30 16:24:27 +01:00
Laurent Destailleur
e72d6c50e6 Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
0fbf578edb Merge pull request #10425 from tarrsalah/fix-css-on-disable-topmenu-images 
FIX css in the case of not showing topmenu images.
 2019-01-30 16:15:40 +01:00
ptibogxiv
5fd75f0824 Fix url payout 2019-01-30 16:15:15 +01:00
Laurent Destailleur
bdbc61c1aa Merge pull request #10454 from grandoc/new_branch_30_01_2019 
update with html5 compliant code
 2019-01-30 16:01:08 +01:00
Laurent Destailleur
104364ed02 Merge pull request #10459 from atm-gauthier/7.0_FIX_cmd_fourn_enabled 
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
 2019-01-30 15:51:09 +01:00
Laurent Destailleur
869159c09f Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:39 +01:00
Laurent Destailleur
1a292839ca Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:18 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
Laurent Destailleur
96f46ec261 Merge pull request #10448 from hregis/8.0_mc 
FIX multicompany compatibility
 2019-01-30 15:25:16 +01:00
Laurent Destailleur
46fcb531d9 Merge pull request #10445 from grandoc/new_branch_29_01_2019 
fix translation
 2019-01-30 15:12:03 +01:00
Laurent Destailleur
c354656b1b Merge pull request #10449 from ptibogxiv/patch-108 
NEW : list of stripe's payout
 2019-01-30 15:02:27 +01:00
Laurent Destailleur
60fa8d08c2 Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import 
FIX: FEC Compatibility for import in ledger
 2019-01-30 15:01:02 +01:00
Laurent Destailleur
3198f9fbbe Merge pull request #10441 from aspangaro/10.0_email 
Move my email to the new one
 2019-01-30 14:59:58 +01:00
Laurent Destailleur
6d3529b606 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-30 14:47:28 +01:00
Laurent Destailleur
340412ed00 FIX generation of document for supplie rinvoice 2019-01-30 14:07:50 +01:00
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
Philippe GRAND
1eb57b6542 update with html5 compliant code 2019-01-30 09:32:19 +01:00
Philippe GRAND
cda89c65cd update with html5 compliant code 2019-01-30 09:30:55 +01:00
Philippe GRAND
cf27065ed1 update with html5 compliant code 2019-01-30 09:24:22 +01:00
Philippe GRAND
bb6159784a update with html5 compliant code 2019-01-30 08:42:31 +01:00
Pierre Ardoin
99892c13b0 FIX : Erreur dans le Total 
Corrige l'erreur de calcul dans le total des produits et services
 2019-01-29 23:26:08 +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
3215870ae6 FIX Exclude not required field from log 2019-01-29 19:02:34 +01:00
Laurent Destailleur
9ef93bceca FIX last_main_doc var not saved 2019-01-29 18:40:47 +01:00
Laurent Destailleur
f4ecf843ee FIX Exclude not required field from log 2019-01-29 18:30:12 +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