andreubisquerra
|
26ee0d1949
|
genimg improvements
|
2020-05-24 16:29:42 +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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
8e113888d8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 17:02:27 +02:00 |
|
Laurent Destailleur
|
64f72daa7e
|
Fix hreflang if canonical page
|
2020-05-23 17:01:22 +02:00 |
|
Francis Appels
|
efa4ffa326
|
Fix ref_int deprecation.
Add to changelog and allow to use ref_ext for shipments.
|
2020-05-23 16:46:42 +02:00 |
|
Laurent Destailleur
|
051e009c47
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 15:50:25 +02:00 |
|
Laurent Destailleur
|
748a120b71
|
Show button for categories if module is enabled
|
2020-05-23 15:50:15 +02:00 |
|
Laurent Destailleur
|
bf0327952b
|
Merge pull request #13875 from ptibogxiv/patch-339
NEW Date shipment from order accepts hours
|
2020-05-23 15:42:24 +02:00 |
|
Laurent Destailleur
|
9b54ed766b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 15:37:08 +02:00 |
|
Laurent Destailleur
|
aec5200a98
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/variants/class/ProductCombination.class.php
|
2020-05-23 15:37:00 +02:00 |
|
Laurent Destailleur
|
7c92bb218e
|
Fix no hreflang if not a canonical page
|
2020-05-23 15:33:04 +02:00 |
|
Laurent Destailleur
|
4913d10724
|
Merge branch 'develop' into patch-339
|
2020-05-23 15:14:06 +02:00 |
|
Laurent Destailleur
|
d8d5907aff
|
Merge pull request #13939 from grandoc/develop
Fix : some comment and translation
|
2020-05-23 15:11:32 +02:00 |
|
Laurent Destailleur
|
697d4d684e
|
Merge pull request #13899 from andreubisquerra/master
TakePOS Auto Order improvements
|
2020-05-23 15:11:01 +02:00 |
|
Laurent Destailleur
|
394ea5075f
|
Merge pull request #13823 from aspangaro/12.0_a25
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
|
2020-05-23 15:07:27 +02:00 |
|
Laurent Destailleur
|
c2b2e17b58
|
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl
NEW conf to allow show full arbo in warehouse getnomurl
|
2020-05-23 15:05:08 +02:00 |
|
Laurent Destailleur
|
5bbbabf653
|
Update stocks.lang
|
2020-05-23 15:04:59 +02:00 |
|
Laurent Destailleur
|
abe7472ee5
|
Update stocks.lang
|
2020-05-23 15:03:57 +02:00 |
|
Philippe Grand
|
af17781b2b
|
fix : personnal font file within tcpdf
|
2020-05-23 15:01:40 +02:00 |
|
Philippe Grand
|
6c15ff2ac1
|
fix : personnal font file within tcpdf
|
2020-05-23 15:01:25 +02:00 |
|