Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,188 Commits 36 Branches 190 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

55188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
 2016-08-05 00:42:40 +02:00
Laurent Destailleur
40723b264a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-05 00:37:10 +02:00
Laurent Destailleur
c2e81b6edb Fix colspan 2016-08-05 00:36:58 +02:00
Laurent Destailleur
112b945e6b Merge pull request #5583 from atm-florian/3.9 
FIX : update limit stock on product stock
 2016-08-05 00:34:32 +02:00
Laurent Destailleur
5555037346 Merge pull request #5580 from simnandez/4.0 
NEW Add Panama datas
 2016-08-05 00:34:05 +02:00
Laurent Destailleur
bdf779dfd2 Merge pull request #5578 from aspangaro/4.0-p37 
Uniformize presentation
 2016-08-05 00:32:49 +02:00
Laurent Destailleur
16c7d51abc Merge pull request #5576 from atm-florian/3.9_fixPHPStrict 
FIX php Strict
 2016-08-05 00:26:47 +02:00
Juanjo Menent
48fe3524d5 Fix #5582 Can't add or change customer ref on proposal 2016-08-04 17:34:53 +02:00
Juanjo Menent
1253b73879 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-08-04 17:24:43 +02:00
Juanjo Menent
d76c57fed9 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-08-04 17:05:18 +02:00
Laurent Destailleur
81fc86ba06 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 12:10:40 +02:00
Laurent Destailleur
5247faf50f Fix align 2016-08-04 10:48:19 +02:00
Laurent Destailleur
e0b9496f9e Fix link sometimes fails because of id not defined 2016-08-04 10:44:17 +02:00
Laurent Destailleur
182338beb1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 10:27:50 +02:00
Laurent Destailleur
11ab49d85d Fix bad help 2016-08-04 10:27:19 +02:00
Laurent Destailleur
af150c35fc Fix no picto on setup pages 2016-08-04 10:19:30 +02:00
Laurent Destailleur
caa987fb61 Clean obsolete comment 2016-08-04 10:13:27 +02:00
Laurent Destailleur
f14ef7b50f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 10:12:34 +02:00
Laurent Destailleur
da84fac390 Fix: data were lost if creation failed 2016-08-04 10:08:58 +02:00
Laurent Destailleur
7c97bf900f Neutral colors 2016-08-03 20:52:50 +02:00
florian HENRY
5f415478ac FIX : update limit stock on product stock 2016-08-03 17:29:04 +02:00
Juanjo Menent
965011c8bc Merge pull request #5579 from atm-florian/3.8 
FIX : Weather icon is not calculated correctly
 2016-08-03 10:33:29 +02:00
Juanjo Menent
51a4f9e5d7 Merge pull request #5575 from aspangaro/4.0-p36 
Fix Expense report | if VAT disable in Dolibarr, traduction of code_libelle & presentation
 2016-08-03 10:30:40 +02:00
Juanjo Menent
597f5dae15 Merge pull request #5551 from marcosgdf/bug-5549 
FIX #5549 getNomUrl tooltips show Order info even if user has no rights to read them
 2016-08-03 10:27:44 +02:00
Juanjo Menent
aadf52fe59 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-08-03 10:11:37 +02:00
Juanjo Menent
28efc3e50f NEW Add Panama datas 2016-08-03 09:45:12 +02:00
florian HENRY
0d536bff54 Fix dashboard 2016-08-03 09:04:24 +02:00
aspangaro
27603b966e Uniformize presentation on supplier order 2016-08-03 08:25:35 +02:00
aspangaro
21e753d510 Uniformize presentation on intervention 2016-08-03 08:00:30 +02:00
aspangaro
da274f0ca4 Uniformize presentation on contract 2016-08-03 07:28:00 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
6ae8d26a89 Fix max width on combo of tasks 2016-08-03 00:04:38 +02:00
Laurent Destailleur
216ec6ac4b Label week too long with some language 2016-08-02 23:33:31 +02:00
Laurent Destailleur
88dcb27981 Fix option not visible when it should 2016-08-02 21:24:14 +02:00
Laurent Destailleur
176b52f305 Fix No modify trigger must be called during creation 2016-08-02 17:55:13 +02:00
Laurent Destailleur
3ea7a1fcab Fix strict mode 2016-08-02 17:36:24 +02:00
Laurent Destailleur
75b909ce93 Fix missing transaction in update_perso function 2016-08-02 16:55:32 +02:00
florian HENRY
5144f21c6c FIX php Strict 2016-08-02 15:36:00 +02:00
Laurent Destailleur
cc21909909 Fix dol_include_once could not work to get external url of a module 2016-08-02 14:33:46 +02:00
Laurent Destailleur
86f576f8d3 Fix strict sql 2016-08-02 13:45:35 +02:00
Laurent Destailleur
54df49aebe Fix strict sql 2016-08-02 13:36:16 +02:00
Laurent Destailleur
fdfe333f69 Fix strict sql 2016-08-02 13:10:09 +02:00
aspangaro
f232ae9160 Fix Expense report | VAT disable in Dolibarr, traduction of code_libelle & presentation 2016-08-02 07:47:15 +02:00
aspangaro
dd2e43754e Uniformize presentation in Thirdparty 2016-08-02 06:02:01 +02:00
Laurent Destailleur
e335ce6f45 Fix bad var declared 2016-08-01 19:54:03 +02:00
Laurent Destailleur
dfc38351ef Fix $i not initialized 2016-08-01 19:48:39 +02:00
Laurent Destailleur
a35dd9f2d1 Fix bad separation of address 2016-08-01 19:37:17 +02:00
Laurent Destailleur
5eda10e0dd Fix link 2016-08-01 16:04:49 +02:00
Laurent Destailleur
a02c539a82 FIX #5521 2016-08-01 15:53:51 +02:00
Laurent Destailleur
7dec327995 FIX #5568 2016-08-01 15:43:40 +02:00