Laurent Destailleur
|
bbb751dc53
|
Merge pull request #17822 from frederic34/zapier_create_contacts
add more capabilities for zapier
|
2021-06-11 19:51:01 +02:00 |
|
Laurent Destailleur
|
d3815cbb93
|
css
|
2021-06-11 19:42:36 +02:00 |
|
Laurent Destailleur
|
04a500f516
|
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
Adding hooks on product stat in order to allow to expand stat on othe…
|
2021-06-11 19:33:37 +02:00 |
|
Laurent Destailleur
|
5d2f5b2305
|
Update product.lib.php
|
2021-06-11 19:33:07 +02:00 |
|
Laurent Destailleur
|
37ebedcafa
|
Update product.lib.php
|
2021-06-11 19:32:25 +02:00 |
|
Laurent Destailleur
|
c4d0086b8a
|
Fix hook context names
|
2021-06-11 19:24:26 +02:00 |
|
Laurent Destailleur
|
e6c9ae2349
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/price.php
|
2021-06-11 19:09:17 +02:00 |
|
Laurent Destailleur
|
663cf28eba
|
Fix lost code during previous merge
|
2021-06-11 19:05:33 +02:00 |
|
Laurent Destailleur
|
756786f717
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
|
2021-06-11 19:05:05 +02:00 |
|
Laurent Destailleur
|
cfbf051fca
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-06-11 18:47:09 +02:00 |
|
Laurent Destailleur
|
4fd9d36eb9
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/product/price.php
|
2021-06-11 18:46:51 +02:00 |
|
Laurent Destailleur
|
65f8405ca4
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-06-11 18:44:45 +02:00 |
|
Laurent Destailleur
|
6bf9a72dab
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-06-11 18:44:37 +02:00 |
|
Laurent Destailleur
|
eefc6ddf83
|
Fix phpcs
|
2021-06-11 18:44:01 +02:00 |
|
Laurent Destailleur
|
06201fa9bb
|
Merge pull request #17848 from atm-greg/FIX_update_only_vat_on_multiprice
verify vat change to update multiprice
|
2021-06-11 18:22:40 +02:00 |
|
Laurent Destailleur
|
4e66e134bd
|
Update price.php
|
2021-06-11 18:21:00 +02:00 |
|
Laurent Destailleur
|
4cde4f6162
|
Merge pull request #17875 from OPEN-DSI/new-doactions-hook-on-bank-card
NEW do actions hook on bank card
|
2021-06-11 18:18:06 +02:00 |
|
Laurent Destailleur
|
a057f17e56
|
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice
remove useless check on invoice line content when generating pdf
|
2021-06-11 18:13:58 +02:00 |
|
Laurent Destailleur
|
41d9324600
|
Merge pull request #17888 from marc-dll/11.0_FIX_activity_task_assignment
FIX: project time spent by day/week: quote mismatch in SQL query to assign to check task assigment
|
2021-06-11 18:12:57 +02:00 |
|
Laurent Destailleur
|
a8f11fec31
|
Update perweek.php
|
2021-06-11 18:12:39 +02:00 |
|
Laurent Destailleur
|
057d91698f
|
Update perday.php
|
2021-06-11 18:11:55 +02:00 |
|
Laurent Destailleur
|
794b10ec54
|
Merge pull request #17889 from marc-dll/12.0_FIX_activity_task_assignment
FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment
|
2021-06-11 18:11:19 +02:00 |
|
Laurent Destailleur
|
0315f45198
|
Update permonth.php
|
2021-06-11 18:10:57 +02:00 |
|
Laurent Destailleur
|
c1745c6fc3
|
Merge pull request #17881 from frederic34/patch-9
fix warnings
|
2021-06-11 18:03:54 +02:00 |
|
Laurent Destailleur
|
9e6890c719
|
Merge pull request #17884 from frederic34/patch-12
fix warning
|
2021-06-11 18:02:54 +02:00 |
|
Laurent Destailleur
|
ffb879d152
|
Merge pull request #17880 from frederic34/patch-8
fix warning
|
2021-06-11 18:02:45 +02:00 |
|
Laurent Destailleur
|
fbe970c739
|
Merge pull request #17879 from frederic34/patch-7
try to fix
|
2021-06-11 18:02:29 +02:00 |
|
Laurent Destailleur
|
9dbfba07e7
|
Merge pull request #17882 from frederic34/patch-11
fix warning
|
2021-06-11 18:01:20 +02:00 |
|
Laurent Destailleur
|
0b4385b554
|
Merge pull request #17885 from frederic34/patch-13
fix warnings
|
2021-06-11 18:00:48 +02:00 |
|
Laurent Destailleur
|
0bbe2210f2
|
FIX #17649
|
2021-06-11 17:58:52 +02:00 |
|
Laurent Destailleur
|
92dc0d28ce
|
Fix disallow reserved values for field name
|
2021-06-11 17:50:52 +02:00 |
|
Laurent Destailleur
|
ac965bf49a
|
FIX #16551
|
2021-06-11 17:40:04 +02:00 |
|
Laurent Destailleur
|
73a1119b26
|
Clean code
|
2021-06-11 15:21:24 +02:00 |
|
Laurent Destailleur
|
c2b910f6ed
|
Clean code
|
2021-06-11 15:08:54 +02:00 |
|
Laurent Destailleur
|
1605564d5e
|
Clean code
|
2021-06-11 14:54:18 +02:00 |
|
Laurent Destailleur
|
52f0de00f6
|
Fix missing fields
|
2021-06-11 13:17:22 +02:00 |
|
Laurent Destailleur
|
a88efc9065
|
Fix permission on produce and consume
Missing API to produce
|
2021-06-11 09:58:03 +02:00 |
|
Laurent Destailleur
|
e17ab1cca6
|
Clean code
|
2021-06-11 09:22:01 +02:00 |
|
Laurent Destailleur
|
b0b2bb4d86
|
Fix trans
|
2021-06-11 09:20:59 +02:00 |
|
Marc de Lima Lucio
|
3f72f9b544
|
FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment
|
2021-06-10 23:29:37 +02:00 |
|
Marc de Lima Lucio
|
96656ff148
|
FIX: project time spent by day/week: quote mismatch is SQL query to assign to check task assigment
|
2021-06-10 23:26:33 +02:00 |
|
Frédéric FRANCE
|
f58cf14ae9
|
Update html.formmail.class.php
|
2021-06-10 22:28:19 +02:00 |
|
Frédéric FRANCE
|
86f39795c0
|
fix warnings
|
2021-06-10 22:26:58 +02:00 |
|
Frédéric FRANCE
|
acc41adb8d
|
fix warning
|
2021-06-10 22:22:24 +02:00 |
|
Frédéric FRANCE
|
759472f5d1
|
fix warning
|
2021-06-10 20:58:56 +02:00 |
|
Frédéric FRANCE
|
86eea2c4fc
|
Update list.php
|
2021-06-10 20:55:00 +02:00 |
|
Frédéric FRANCE
|
3f40a65f26
|
fix warnings
|
2021-06-10 20:53:29 +02:00 |
|
Frédéric FRANCE
|
3cb17d7535
|
fix warning
|
2021-06-10 20:40:10 +02:00 |
|
Frédéric FRANCE
|
648c1ef3a6
|
try to fix
|
2021-06-10 20:32:45 +02:00 |
|
Laurent Destailleur
|
77efbda148
|
Fix responsive
|
2021-06-10 20:04:21 +02:00 |
|