Laurent Destailleur
|
bb64d1a67f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 01:50:36 +01:00 |
|
Laurent Destailleur
|
32ff76178e
|
FIX #15168
|
2020-10-27 01:44:00 +01:00 |
|
Laurent Destailleur
|
77841b8889
|
Merge pull request #15155 from javierybar/develop
NEW Credit note in TakePOS
|
2020-10-27 01:26:10 +01:00 |
|
Laurent Destailleur
|
96ad9d27fa
|
Merge pull request #15174 from frederic34/patch-8
clean code interface_99_modZapier_ZapierTriggers.class.php
|
2020-10-27 01:25:43 +01:00 |
|
Laurent Destailleur
|
f801bc65c8
|
Merge pull request #15173 from frederic34/patch-6
Clean code interface_20_all_Logevents.class.php
|
2020-10-27 01:25:16 +01:00 |
|
Laurent Destailleur
|
1940d008a0
|
Merge pull request #15175 from frederic34/indexmembers
display last members like on list
|
2020-10-27 01:24:54 +01:00 |
|
Laurent Destailleur
|
624e116ecb
|
Merge pull request #15176 from frederic34/patch-10
add small photo in picto link
|
2020-10-27 01:23:57 +01:00 |
|
Frédéric FRANCE
|
4a0dd3b4bc
|
add small photo in picto link
|
2020-10-26 22:05:40 +01:00 |
|
Frédéric FRANCE
|
d3c87dabab
|
display members
|
2020-10-26 21:51:17 +01:00 |
|
Frédéric FRANCE
|
42f5fd7d5f
|
display last members like on list
|
2020-10-26 21:38:16 +01:00 |
|
Frédéric FRANCE
|
0bdd6abca9
|
Update interface_99_modZapier_ZapierTriggers.class.php
|
2020-10-26 20:14:45 +01:00 |
|
Frédéric FRANCE
|
557a0caa91
|
Update interface_20_all_Logevents.class.php
|
2020-10-26 20:10:19 +01:00 |
|
Laurent Destailleur
|
c918acaadc
|
Doc
|
2020-10-26 19:37:30 +01:00 |
|
Laurent Destailleur
|
fc66e01be8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-26 19:35:09 +01:00 |
|
Laurent Destailleur
|
a352c2d82a
|
Doc
|
2020-10-26 19:34:57 +01:00 |
|
Laurent Destailleur
|
3732c45702
|
Merge pull request #15169 from lyra/develop
NEW Add hooks to allow external payment modules
|
2020-10-26 19:34:23 +01:00 |
|
Laurent Destailleur
|
2340cb654d
|
Merge pull request #15149 from defrance/patch-160
Display application Title if filled on login page
|
2020-10-26 19:32:42 +01:00 |
|
Laurent Destailleur
|
680f4f9fee
|
Update login.tpl.php
|
2020-10-26 19:32:21 +01:00 |
|
Laurent Destailleur
|
07729ec431
|
Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery
fix migration livraison to delivery
|
2020-10-26 19:28:59 +01:00 |
|
Laurent Destailleur
|
a8fccc67ba
|
Merge pull request #15148 from frederic34/patch-6
doxygen
|
2020-10-26 19:28:11 +01:00 |
|
Laurent Destailleur
|
c1cd25fb6b
|
Merge pull request #15151 from frederic34/patch-8
selectTypeContact return void
|
2020-10-26 19:27:52 +01:00 |
|
Laurent Destailleur
|
a079cbe353
|
Merge pull request #15152 from frederic34/patch-10
doxygen and clean code
|
2020-10-26 19:27:28 +01:00 |
|
Laurent Destailleur
|
5e19483c99
|
Update don.class.php
|
2020-10-26 19:26:55 +01:00 |
|
Laurent Destailleur
|
58a5585d0e
|
Merge pull request #15154 from frederic34/categories
clean code
|
2020-10-26 19:25:13 +01:00 |
|
Laurent Destailleur
|
b2f08e5762
|
Update categorie.class.php
|
2020-10-26 19:23:23 +01:00 |
|
Laurent Destailleur
|
87f65d2487
|
Merge pull request #15156 from frederic34/patch-11
set unknown variables
|
2020-10-26 19:22:43 +01:00 |
|
Laurent Destailleur
|
e39adbdcb5
|
Merge pull request #15157 from frederic34/patch-13
doxygen
|
2020-10-26 19:22:13 +01:00 |
|
Laurent Destailleur
|
6926610e9e
|
Merge pull request #15158 from frederic34/patch-14
undefined variable
|
2020-10-26 19:21:57 +01:00 |
|
Laurent Destailleur
|
244f74ddfe
|
Merge pull request #15162 from FHenry/develop
fix bad link index thirdparty
|
2020-10-26 19:12:23 +01:00 |
|
Laurent Destailleur
|
8051db9ad8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-26 19:09:16 +01:00 |
|
Laurent Destailleur
|
0abce469e9
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-26 19:09:08 +01:00 |
|
Laurent Destailleur
|
f18a13b2d4
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/product/class/productcustomerprice.class.php
|
2020-10-26 19:08:11 +01:00 |
|
Laurent Destailleur
|
78a52eda96
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/main.inc.php
htdocs/product/class/productcustomerprice.class.php
|
2020-10-26 19:05:30 +01:00 |
|
Laurent Destailleur
|
50ede5224a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-10-26 19:02:47 +01:00 |
|
Laurent Destailleur
|
c58d3d0cf7
|
FIX #15163
|
2020-10-26 19:02:26 +01:00 |
|
Laurent Destailleur
|
ca66df2a7b
|
Merge pull request #15167 from marc-dll/FIX_10.0_customer_price_triggers
FIX: product customer prices: missing triggers in CRUD class
|
2020-10-26 18:59:44 +01:00 |
|
Laurent Destailleur
|
5e2b0a98cc
|
Merge pull request #15170 from fappels/13_set_date_livraison
Re-add set_date_livraison as a deprecated function.
|
2020-10-26 18:57:17 +01:00 |
|
Laurent Destailleur
|
130591480a
|
Merge pull request #15171 from frederic34/cleantriggers
clean triggers
|
2020-10-26 18:54:54 +01:00 |
|
Laurent Destailleur
|
3e050eba8c
|
Merge pull request #15172 from fappels/13_fix_reception
Fix reception fetch_lines
|
2020-10-26 18:53:15 +01:00 |
|
Frédéric FRANCE
|
9c51d467b5
|
clean triggers
|
2020-10-26 18:49:38 +01:00 |
|
Frédéric FRANCE
|
360ea91be5
|
clean triggers
|
2020-10-26 18:46:03 +01:00 |
|
Francis Appels
|
b6142dded6
|
Remove phpcs disable enable from setDeliveryDate in delivery class
|
2020-10-26 18:40:24 +01:00 |
|
Frédéric FRANCE
|
66fbddb892
|
clean triggers
|
2020-10-26 18:35:27 +01:00 |
|
Frédéric FRANCE
|
3e686e167c
|
clean triggers
|
2020-10-26 18:31:45 +01:00 |
|
Laurent Destailleur
|
3ee618d736
|
FIX Clean orphan records in llx_ecm_files into repair script.
|
2020-10-26 18:31:12 +01:00 |
|
Francis Appels
|
1ba0e92c41
|
Fix reception fetch_lines
|
2020-10-26 18:30:32 +01:00 |
|
Francis Appels
|
93ab281d81
|
Fix tab indent
|
2020-10-26 18:21:47 +01:00 |
|
Laurent Destailleur
|
efce53abd1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/expensereport/class/expensereport.class.php
|
2020-10-26 18:17:23 +01:00 |
|
Laurent Destailleur
|
2c2142ddba
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-10-26 18:13:47 +01:00 |
|
Francis Appels
|
91496682fb
|
Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison
|
2020-10-26 18:13:36 +01:00 |
|