andreubisquerra
|
d60bcb871f
|
Fix travis
|
2020-05-24 18:24:41 +02:00 |
|
Laurent Destailleur
|
84ec747109
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-24 18:04:26 +02:00 |
|
Laurent Destailleur
|
7a17bbacb9
|
Can force lang during import
|
2020-05-24 18:04:08 +02:00 |
|
andreubisquerra
|
957c40e072
|
Fix travis
|
2020-05-24 18:03:07 +02:00 |
|
Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
andreubisquerra
|
3632111705
|
Fix travis
|
2020-05-24 17:29:35 +02:00 |
|
andreubisquerra
|
c80989d74f
|
phone.php improvements
|
2020-05-24 16:31:22 +02:00 |
|
andreubisquerra
|
221e8d8ce1
|
invoice.php improvements
|
2020-05-24 16:30:42 +02:00 |
|
andreubisquerra
|
26ee0d1949
|
genimg improvements
|
2020-05-24 16:29:42 +02:00 |
|
Laurent Destailleur
|
65708ec360
|
Fix responsive
|
2020-05-24 15:07:57 +02:00 |
|
Laurent Destailleur
|
75fc8b9adf
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-24 12:11:53 +02:00 |
|
Laurent Destailleur
|
e2f0f0d71d
|
Add exclude id
|
2020-05-24 12:11:39 +02:00 |
|
Francis Appels
|
4eb50ac339
|
Merge remote-tracking branch 'Dolibarr/12.0' into 12
|
2020-05-24 11:05:18 +02:00 |
|
Laurent Destailleur
|
dacb326c15
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-24 01:10:41 +02:00 |
|
Laurent Destailleur
|
509ce9f571
|
CSS
|
2020-05-24 01:09:45 +02:00 |
|
Laurent Destailleur
|
fd61214b97
|
Merge
|
2020-05-24 01:06:45 +02:00 |
|
Laurent Destailleur
|
4cb0ffeb1f
|
Fix css
|
2020-05-24 01:04:56 +02:00 |
|
Laurent Destailleur
|
6056ed2755
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-24 01:02:08 +02:00 |
|
Laurent Destailleur
|
ef17ed2f87
|
Look and feel v12
|
2020-05-24 00:01:52 +02:00 |
|
Laurent Destailleur
|
2b963479a8
|
Sync transifex
|
2020-05-23 23:50:00 +02:00 |
|
Laurent Destailleur
|
02d5359749
|
Fix transifex sync
|
2020-05-23 23:30:52 +02:00 |
|
Laurent Destailleur
|
c843da5272
|
Sync transifex
|
2020-05-23 22:29:45 +02:00 |
|
Laurent Destailleur
|
3dca55661c
|
Fix Add unit test to avoid the big % instead of comon % char.
|
2020-05-23 22:01:17 +02:00 |
|
Frédéric FRANCE
|
67b8ab13c9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 21:45:18 +02:00 |
|
Frédéric FRANCE
|
a7e0fe24ff
|
Merge remote-tracking branch 'upstream/develop' into free_email
|
2020-05-23 21:44:14 +02:00 |
|
Frédéric FRANCE
|
5c78eca68a
|
prepare new rule
|
2020-05-23 21:14:44 +02:00 |
|
Frédéric FRANCE
|
174ddc5fd4
|
prepare new rule
|
2020-05-23 21:07:47 +02:00 |
|
Laurent Destailleur
|
024e62a582
|
Fix navigation
|
2020-05-23 20:27:25 +02:00 |
|
Laurent Destailleur
|
7bfbf3c88b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:20:53 +02:00 |
|
Laurent Destailleur
|
fe6453194e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-05-23 20:18:17 +02:00 |
|
Laurent Destailleur
|
45ddde6940
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:18:10 +02:00 |
|
Laurent Destailleur
|
278809869d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/margin/tabs/productMargins.php
|
2020-05-23 20:13:12 +02:00 |
|
Laurent Destailleur
|
9fdd718c22
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 20:11:20 +02:00 |
|
Laurent Destailleur
|
40777cbcd9
|
Fix phpcs
|
2020-05-23 20:11:10 +02:00 |
|
Laurent Destailleur
|
97a4c32870
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-05-23 20:09:41 +02:00 |
|
Laurent Destailleur
|
127534ef55
|
Fix common var name seems to be $objref for subdir of doc
|
2020-05-23 20:09:31 +02:00 |
|
Laurent Destailleur
|
28bd962559
|
Merge pull request #13703 from frederic34/entrepotlibelle
remove deprecated libelle to fix phpunit
|
2020-05-23 19:25:04 +02:00 |
|
Laurent Destailleur
|
be641c3d09
|
Merge pull request #13914 from aspangaro/12.0_a27
NEW Add employee in expense report binding page
|
2020-05-23 19:23:20 +02:00 |
|
Laurent Destailleur
|
d6470519eb
|
Update list.php
|
2020-05-23 19:21:03 +02:00 |
|
Laurent Destailleur
|
1ed3b385fa
|
Update lines.php
|
2020-05-23 19:19:28 +02:00 |
|
Laurent Destailleur
|
558a441b41
|
Update lines.php
|
2020-05-23 19:18:13 +02:00 |
|
Laurent Destailleur
|
e086cdcf2a
|
Update lines.php
|
2020-05-23 19:17:09 +02:00 |
|
Laurent Destailleur
|
2ccd6c1e9a
|
Update lines.php
|
2020-05-23 19:16:37 +02:00 |
|
Laurent Destailleur
|
6c3a238981
|
Update lines.php
|
2020-05-23 19:14:33 +02:00 |
|
Laurent Destailleur
|
173662e98c
|
Update lines.php
|
2020-05-23 19:14:05 +02:00 |
|
Laurent Destailleur
|
b10976562f
|
Merge pull request #13958 from fappels/12_ref_int_deprication
Fix ref_int deprecation.
|
2020-05-23 19:12:21 +02:00 |
|
Frédéric FRANCE
|
6522bb70fd
|
fix merge
|
2020-05-23 19:06:01 +02:00 |
|
Frédéric FRANCE
|
48f12c8307
|
Merge remote-tracking branch 'origin/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:58:18 +02:00 |
|
Frédéric FRANCE
|
5aa84c64d0
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:54:33 +02:00 |
|
stickler-ci
|
66637ba0b6
|
Fixing style errors.
|
2020-05-23 16:39:06 +00:00 |
|