Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,922 Commits 36 Branches 190 Tags
70b11f18b51fac1f679080f832c3931e825468f5
Commit Graph

11911 Commits

Author SHA1 Message Date
Laurent Destailleur
70b11f18b5 FIX #7367 2017-09-18 16:06:58 +02:00
Laurent Destailleur
eaee8ee586 Fix box activity again 2017-09-17 21:30:27 +02:00
Laurent Destailleur
f76b675e09 Fix box activity again 2017-09-17 21:30:15 +02:00
Laurent Destailleur
99149b5cfe Fix box activity again 2017-09-17 21:30:11 +02:00
Laurent Destailleur
2c3428a1bf Fix css 2017-09-17 20:48:09 +02:00
Laurent Destailleur
94368accc1 Fix activity box 2017-09-17 20:37:18 +02:00
Laurent Destailleur
ee774f1bf9 FIX Calculation in the activity box 2017-09-17 20:20:48 +02:00
Laurent Destailleur
9e29ea8011 FIX Must use pdf format page as default for merging PDF. 2017-09-16 18:32:43 +02:00
Laurent Destailleur
97e8974fdf FIX Better protection to no send email when we change limit 2017-09-16 13:29:07 +02:00
Laurent Destailleur
ff7a17eb96 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2017-09-16 12:11:18 +02:00
Laurent Destailleur
058b690e25 FIX menu enty when url is external link 2017-09-16 09:22:52 +02:00
Laurent Destailleur
8986640a10 FIX Responsive 2017-09-16 09:16:05 +02:00
Laurent Destailleur
5e4b500b5d Fix signature was changed during insert 2017-09-16 02:22:55 +02:00
Laurent Destailleur
bb6b3db0ac FIX Position of signature on strato template 
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
 2017-09-16 00:50:54 +02:00
Laurent Destailleur
087e22ab94 Fix bad status picto 2017-09-16 00:14:39 +02:00
Laurent Destailleur
cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
 2017-09-15 11:02:34 +02:00
Laurent Destailleur
c52e593ea8 Fix this->db 2017-09-14 21:27:14 +02:00
Laurent Destailleur
f16d88fd53 FIX #7391 2017-09-14 13:17:31 +02:00
Laurent Destailleur
b80b7bbcb9 Merge pull request #7384 from atm-ph/fix_6.0_get_class_self 
Fix get_class(self) instead of get_class($this)
 2017-09-14 12:16:16 +02:00
Laurent Destailleur
f2d092c815 Merge pull request #7377 from hregis/6.0_bug2 
Fix: missing select2 combobox
 2017-09-14 12:08:28 +02:00
Laurent Destailleur
dbb50d7b16 Fix PHP 7.2 2017-09-14 11:56:43 +02:00
Laurent Destailleur
2d7916f77d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/json.lib.php
 2017-09-14 11:49:02 +02:00
Laurent Destailleur
fe1ce5b3ac Fix php 7.2 compatibility 2017-09-14 11:44:47 +02:00
Laurent Destailleur
ed013c1b7e Compatibilty php 7.2 2017-09-14 10:21:04 +02:00
Laurent Destailleur
fed3165b53 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/price.lib.php
 2017-09-13 21:53:03 +02:00
Laurent Destailleur
6d40f797d2 Fix regression 2017-09-13 21:50:14 +02:00
Laurent Destailleur
f2cd96b9c0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	ChangeLog
	htdocs/adherents/class/adherent.class.php
	htdocs/core/lib/price.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/supplier_proposal/list.php
 2017-09-13 20:55:22 +02:00
Laurent Destailleur
dc38ec5051 Fix regression 2017-09-13 20:48:24 +02:00
Laurent Destailleur
9b22f046f5 FIX multicompany better accuracy in rounding and with revenue stamp. 2017-09-13 19:31:32 +02:00
Laurent Destailleur
a5a08006e9 FIX multicompany better accuracy in rounding and with revenue stamp. 2017-09-13 19:27:21 +02:00
Laurent Destailleur
e0eef2080e FIX PDF output was sharing 2 different currencies in same total 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2017-09-13 18:13:43 +02:00
Laurent Destailleur
60078300b8 FIX PDF output was sharing 2 different currencies in same total 2017-09-13 17:57:41 +02:00
Laurent Destailleur
c44a5ede43 FIX Several problem with the last event box on project/tasks 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2017-09-13 15:16:06 +02:00
Laurent Destailleur
6e3174e71a Fix menu to member cards generation page was lost. 2017-09-12 17:36:19 +02:00
atm-ph
30eb03af4c Fix get_class(self) instead of get_class($this) 2017-09-12 16:36:14 +02:00
Regis Houssin
e038e1a2f5 Fix: missing select2 combobox 2017-09-12 09:27:59 +02:00
Laurent Destailleur
44405e5415 Fix #7335 #7365 Better fix 2017-09-11 15:04:29 +02:00
Laurent Destailleur
029f1c411f Merge pull request #7357 from hregis/6.0_medias 
Fix: some problems with medias in multicompany
 2017-09-11 14:13:51 +02:00
Laurent Destailleur
19e780c53f Merge pull request #7346 from hregis/6.0_bug3 
Fix: avoid warning
 2017-09-11 14:07:38 +02:00
Laurent Destailleur
61a0f04bbe FIX dateSelector was not taken into account 2017-09-11 03:30:45 +02:00
Laurent Destailleur
214bad26db Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and 
timezone > 0
 2017-09-11 03:30:10 +02:00
Laurent Destailleur
e9e6a8e5ad Fix center of button 2017-09-11 03:29:36 +02:00
Laurent Destailleur
d13c4b7b84 Better autosize of extrafields 2017-09-11 01:05:55 +02:00
Regis Houssin
762b4eb876 Fix: some problems with medias in multicompany 2017-09-09 17:48:04 +02:00
Regis Houssin
67e9b65a2e Fix: use $array_key value instead 2017-09-09 17:07:08 +02:00
Regis Houssin
db02c32a9f Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3 2017-09-09 12:14:22 +02:00
Laurent Destailleur
8b20c5edab FIX Remove warning when using log into syslog 2017-09-08 15:46:06 +02:00
Laurent Destailleur
03fe9d4e97 Escape all status 2017-09-08 13:23:12 +02:00
Regis Houssin
d4c20a919d Fix: avoid warning 2017-09-08 12:52:56 +02:00