lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,931 Commits 43 Branches 150 Tags 886 MiB
edc59b9290
Commit Graph

61931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
58b49f9a08 Fix position of field to avoid errors 2017-09-13 17:10:23 +02:00
Laurent Destailleur
3deacaa5c4 Fix css pb 2017-09-13 17:10:04 +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
e11c7a08ea Fix translation 2017-09-13 14:24:03 +02:00
Laurent Destailleur
939d33cce7 Fix bug reported by scrutinizer 2017-09-12 19:12:39 +02:00
Laurent Destailleur
0744b5d91b Fix typo 
Conflicts:
	htdocs/public/payment/newpayment.php
 2017-09-12 19:06:47 +02:00
Neil Orley
f68d31d7c5 Add of $urlwithroot in the setBaseUrls function, to use Dolibarr external domain name in the configuration file 2017-09-12 17:45:02 +02:00
Laurent Destailleur
6e3174e71a Fix menu to member cards generation page was lost. 2017-09-12 17:36:19 +02:00
Laurent Destailleur
d572e1ddad Fix duration output 2017-09-12 17:30:18 +02:00
atm-ph
30eb03af4c Fix get_class(self) instead of get_class($this) 2017-09-12 16:36:14 +02:00
Inovea Conseil
f0e0df2660 add translation publisher 
translation for modulehelp.php
 2017-09-12 16:29:06 +02:00
Regis Houssin
cd888a2149 Fix: hide bank account field if module disabled 2017-09-12 15:13:12 +02:00
Maxime Kohlhaas
0608778b9c Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-09-12 11:00:28 +02:00
Regis Houssin
e038e1a2f5 Fix: missing select2 combobox 2017-09-12 09:27:59 +02:00
fappels
681c2a67bd Fix batch required for lot product error message. 2017-09-11 23:22:44 +02:00
fappels
d5b7b7ec52 Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0 2017-09-11 18:13:14 +02:00
Laurent Destailleur
44405e5415 Fix #7335 #7365 Better fix 2017-09-11 15:04:29 +02:00
Laurent Destailleur
e9bc5b719d Complete #7361 2017-09-11 14:50:00 +02:00
reeperbahnause
2fdad0f11d fix #7361 missing generateDocument function 
fix #7361  
Function generateDocument was missing for Class Fichinter
 2017-09-11 14:46:58 +02:00
Laurent Destailleur
6da5a6b82f FIX #7359 
Conflicts:
	htdocs/fichinter/class/fichinter.class.php
 2017-09-11 14:43:40 +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
206e44431d Merge pull request #7356 from hregis/6.0_upgrade 
Fix: missing salaries upgrade reload module
 2017-09-11 14:09:39 +02:00
Laurent Destailleur
31b5ca17f1 Merge pull request #7353 from hregis/6.0_htmlentities 
Fix: avoid htmlentities
 2017-09-11 14:08:37 +02:00
Laurent Destailleur
5a68d69067 Merge pull request #7350 from hregis/6.0_bug2 
Fix: missing parameters for filter and sort (contact list)
 2017-09-11 14:07:56 +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
e9912c020e Merge pull request #7333 from fappels/4.0_fix_transfer_line_extrafields 
FIX transfer of line extrafields from order to invoice
 2017-09-11 14:06:50 +02:00
Laurent Destailleur
646e8713f2 Remove duplicated logs 2017-09-11 13:41:40 +02:00
Laurent Destailleur
b87ce172c3 FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2017-09-11 13:40:34 +02:00
Neil Orley
a300a635d8 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api 2017-09-11 12:14:09 +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
26385fa10d FIX Clean bad parameters when inserting line of template invoice 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
 2017-09-11 01:06:48 +02:00
Laurent Destailleur
d13c4b7b84 Better autosize of extrafields 2017-09-11 01:05:55 +02:00
Laurent Destailleur
c315ad7801 Fix missing tables into childtables 2017-09-10 18:04:13 +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
a8fdf0b5ea Fix: missing salaries upgrade reload module 2017-09-09 16:49:26 +02:00
Regis Houssin
7404a6cf98 Fix: avoid htmlentities 2017-09-09 12:15:59 +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
Regis Houssin
c1c75208ec Fix: missing parameters for filter and sort (contact list) 2017-09-09 09:46:21 +02:00
Laurent Destailleur
bb53146192 Merge pull request #7348 from hregis/6.0_bug2 
Fix: missing parameters for filter and sort
 2017-09-08 21:22:01 +02:00
Laurent Destailleur
23c5b0366f Merge pull request #7344 from atm-florian/6.0_fixphotocateg 
6.0 fixphotocateg
 2017-09-08 21:21:26 +02:00
Regis Houssin
310e912a9d Fix: missing parameters for filter and sort 2017-09-08 19:57:59 +02:00
Laurent Destailleur
c498ce3c41 FIX journalization for bank journal should not rely on a label. 2017-09-08 17:50:39 +02:00
Laurent Destailleur
8b20c5edab FIX Remove warning when using log into syslog 2017-09-08 15:46:06 +02:00
Laurent Destailleur
a6a142753a Fix bad label when account not set 2017-09-08 15:24:27 +02:00