Juanjo Menent
|
788060aa28
|
Merge pull request #9178 from aspangaro/9.0_a3
NEW : Add project on salaries
|
2018-08-02 11:19:34 +02:00 |
|
Juanjo Menent
|
37a9a2df56
|
Merge pull request #9167 from frederic34/include
Include and co are statements
|
2018-08-02 11:03:44 +02:00 |
|
Juanjo Menent
|
03963dfe8a
|
Merge pull request #9163 from frederic34/nolink
fix no link in order list
|
2018-08-02 11:02:39 +02:00 |
|
Juanjo Menent
|
79a13403ae
|
Merge pull request #9162 from frederic34/extratotalize
NEW: Extrafield totalizable
|
2018-08-02 10:59:46 +02:00 |
|
Juanjo Menent
|
738caa605f
|
Merge pull request #9160 from hregis/develop_api
FIX compatibility with multicompany transverse mode
|
2018-08-02 10:57:27 +02:00 |
|
Juanjo Menent
|
e86a970332
|
Merge pull request #9156 from frederic34/patch-20
Update list.php
|
2018-08-02 10:56:01 +02:00 |
|
Juanjo Menent
|
f93519bc2e
|
Merge pull request #9155 from frederic34/patch-19
Update element_resource.php
|
2018-08-02 10:54:30 +02:00 |
|
Juanjo Menent
|
929d8fa66e
|
Merge pull request #9153 from frederic34/patch-17
Update payment.php
|
2018-08-02 10:52:07 +02:00 |
|
Juanjo Menent
|
ca717a7ce1
|
Merge pull request #9152 from frederic34/patch-12
Update card-rec.php
|
2018-08-02 10:50:50 +02:00 |
|
Juanjo Menent
|
82bdbd6f6e
|
Merge pull request #9151 from frederic34/patch-11
Update card.php
|
2018-08-02 10:50:05 +02:00 |
|
Juanjo Menent
|
fcd9d49b16
|
Merge pull request #9159 from grandoc/new_branch_25_07_2018
Clean and update code
|
2018-08-02 10:36:27 +02:00 |
|
Alexandre SPANGARO
|
ee61a88540
|
Small fix
|
2018-08-01 07:46:17 +02:00 |
|
Alexandre SPANGARO
|
0509a176ca
|
Merge branch 'develop' into 9.0_a3
|
2018-07-31 07:47:43 +02:00 |
|
Alexandre SPANGARO
|
b0e2e69ed0
|
New : Add project on salaries
|
2018-07-31 07:45:03 +02:00 |
|
Philippe GRAND
|
541e919ae0
|
Clean and update code
|
2018-07-27 14:49:33 +02:00 |
|
Philippe GRAND
|
4eacad52f2
|
Clean and update code
|
2018-07-27 10:06:56 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Frédéric FRANCE
|
fa2de55109
|
test include
|
2018-07-26 11:50:54 +02:00 |
|
Frédéric FRANCE
|
3f4db55614
|
test include
|
2018-07-26 11:34:51 +02:00 |
|
Frédéric FRANCE
|
aaf4f06686
|
test include
|
2018-07-26 11:10:48 +02:00 |
|
Frédéric FRANCE
|
0952cf5e2b
|
fix no link in order list
|
2018-07-26 10:43:50 +02:00 |
|
Frédéric FRANCE
|
2dd907a8e1
|
extrafield totalizable
|
2018-07-26 09:41:44 +02:00 |
|
Philippe GRAND
|
efa6ad0659
|
Clean and update code
|
2018-07-25 19:05:40 +02:00 |
|
Regis Houssin
|
e48eec583d
|
FIX compatibility with multicompany transverse mode
|
2018-07-25 17:00:49 +02:00 |
|
Philippe GRAND
|
ff04cb64c0
|
Clean and update code
|
2018-07-25 15:36:50 +02:00 |
|
Philippe GRAND
|
7d5464cfbc
|
Clean and update code
|
2018-07-25 15:25:23 +02:00 |
|
Frédéric FRANCE
|
53469ee424
|
Update card-rec.php
|
2018-07-25 11:45:52 +02:00 |
|
Frédéric FRANCE
|
08c4baad24
|
Update list.php
|
2018-07-25 10:15:34 +02:00 |
|
Frédéric FRANCE
|
cddb82f9be
|
Update element_resource.php
|
2018-07-25 10:11:44 +02:00 |
|
Frédéric FRANCE
|
f79415e740
|
Update payment.php
|
2018-07-25 10:08:01 +02:00 |
|
Frédéric FRANCE
|
c7ad6c9a7c
|
Update card-rec.php
|
2018-07-25 10:04:44 +02:00 |
|
Frédéric FRANCE
|
cac596037f
|
Update card.php
|
2018-07-25 09:50:04 +02:00 |
|
Laurent Destailleur
|
0c0c9269d5
|
Merge pull request #9148 from hregis/develop_api
FIX clean code
|
2018-07-24 21:41:41 +02:00 |
|
Laurent Destailleur
|
e024ea9c05
|
Merge pull request #9146 from grandoc/new_branch_24_07_2018
Clean and update code
|
2018-07-24 21:41:12 +02:00 |
|
Regis Houssin
|
ff733c5ad7
|
FIX clean code
|
2018-07-24 20:10:27 +02:00 |
|
Laurent Destailleur
|
dc2fec8f57
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-24 19:37:04 +02:00 |
|
Laurent Destailleur
|
7821e21e5b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-07-24 19:23:51 +02:00 |
|
Laurent Destailleur
|
d871b8964f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-07-24 19:23:40 +02:00 |
|
Laurent Destailleur
|
927727edf3
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-07-24 19:22:12 +02:00 |
|
Laurent Destailleur
|
20f178fdfe
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
|
2018-07-24 19:22:00 +02:00 |
|
Laurent Destailleur
|
f672e8bf02
|
Fix trans
|
2018-07-24 19:12:35 +02:00 |
|
Philippe GRAND
|
2a6f050e32
|
Clean and update code
|
2018-07-24 18:28:56 +02:00 |
|
Laurent Destailleur
|
f50aa03187
|
Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish
FIX: stock replenish with multientity
|
2018-07-24 18:10:00 +02:00 |
|
Laurent Destailleur
|
e9eb8da61b
|
Update replenish.php
|
2018-07-24 18:09:50 +02:00 |
|
Laurent Destailleur
|
77c121b15c
|
Merge pull request #9099 from ATM-Nicolas/7.0
NEW Set contactCivName substitution key
|
2018-07-24 18:02:21 +02:00 |
|
Laurent Destailleur
|
ece655a84a
|
Merge pull request #9128 from atm-john/fix_situation_invoice_status
Fix situation invoice status
|
2018-07-24 17:49:53 +02:00 |
|
Laurent Destailleur
|
869a97c8d1
|
Update card.php
|
2018-07-24 17:49:10 +02:00 |
|
Laurent Destailleur
|
a469f841f7
|
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
|
2018-07-24 17:47:37 +02:00 |
|
Laurent Destailleur
|
bb9c53b41f
|
Merge pull request #9118 from bugness-chl/8.0
corr. "group by" for PostgreSQL
|
2018-07-24 17:43:36 +02:00 |
|
Laurent Destailleur
|
08a5b499fe
|
Merge pull request #9139 from bugness-chl/8.0-translation
Translation: adding 'Enable' term in main
|
2018-07-24 17:41:53 +02:00 |
|