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 |
|
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 |
|
Laurent Destailleur
|
1bf63c7862
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
|
2021-06-10 16:53:09 +02:00 |
|
Laurent Destailleur
|
1950e50c89
|
Fix test
|
2021-06-10 16:31:28 +02:00 |
|
Laurent Destailleur
|
c8c9fb7700
|
FIX #17847
|
2021-06-10 16:29:30 +02:00 |
|
Alexandre SPANGARO
|
08186fdff1
|
Fix warning - search_societe is already present
|
2021-06-10 06:28:09 +02:00 |
|
Alexandre SPANGARO
|
b216c81c60
|
FIX Customer invoice list - Pagination lost search_date_xxx information
|
2021-06-10 06:22:03 +02:00 |
|
Laurent Destailleur
|
53af424a3d
|
Fix total tva
|
2021-06-10 02:12:29 +02:00 |
|
Laurent Destailleur
|
5f925d9e3b
|
Fix total -> total_ht
|
2021-06-10 02:10:58 +02:00 |
|
Laurent Destailleur
|
ae6d2ba9b5
|
Fix missing user creation/modif of template invoice
|
2021-06-10 01:56:20 +02:00 |
|
Laurent Destailleur
|
9afe8e54a7
|
Fix
|
2021-06-10 00:41:15 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
fa4786a3f6
|
Fix permission
|
2021-06-08 16:19:21 +02:00 |
|
Frédéric FRANCE
|
0ea0966b09
|
Update card.php
|
2021-06-08 12:01:05 +02:00 |
|
Frédéric FRANCE
|
b1c3a7cf48
|
avoid fatal error
|
2021-06-08 10:38:34 +02:00 |
|
Laurent Destailleur
|
2182e7fd54
|
Look and feel v14
|
2021-06-04 14:36:52 +02:00 |
|
Laurent Destailleur
|
27018bd4b4
|
Fix group by
|
2021-06-04 14:25:32 +02:00 |
|
Laurent Destailleur
|
8b5922a0df
|
Update card.php
|
2021-06-04 12:57:43 +02:00 |
|
Laurent Destailleur
|
43be7cf996
|
Update card.php
|
2021-06-04 12:56:40 +02:00 |
|
Laurent Destailleur
|
292d5f6a15
|
Update card.php
|
2021-06-04 12:55:03 +02:00 |
|
stickler-ci
|
dfb2e54750
|
Fixing style errors.
|
2021-05-27 14:25:42 +00:00 |
|
Frans Bosman
|
fd2d10d443
|
Update card.php
|
2021-05-27 16:23:33 +02:00 |
|
stickler-ci
|
c31530e7ed
|
Fixing style errors.
|
2021-05-27 10:24:18 +00:00 |
|
Frans Bosman
|
61753791b4
|
Update card.php
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
|
2021-05-27 12:20:42 +02:00 |
|
Laurent Destailleur
|
4b47611e23
|
Debug v14
|
2021-05-25 21:21:09 +02:00 |
|
Laurent Destailleur
|
91f85abb7e
|
Fix only comment to understand code are allowed
|
2021-05-20 14:55:37 +02:00 |
|
Laurent Destailleur
|
afd9c09c8f
|
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var
fix: change societe by company varaible name in all file
|
2021-05-20 13:54:01 +02:00 |
|
Florian HENRY
|
5e6d6ccf67
|
same bug on invoie list
|
2021-05-20 13:45:52 +02:00 |
|
Florian HENRY
|
7874be6e37
|
bad comment remove
|
2021-05-20 12:48:18 +02:00 |
|
Florian HENRY
|
d93cf0beb7
|
fix: change societe by company varaible name in all file
|
2021-05-20 12:36:26 +02:00 |
|
Laurent Destailleur
|
dbd7292cd6
|
Replace doubleval into floatval
|
2021-05-20 09:22:55 +02:00 |
|
Sylvain Legrand
|
a3d1b49c65
|
Error in list when using alias name of thirdparty
|
2021-05-19 19:08:58 +02:00 |
|
Laurent Destailleur
|
217ee260c2
|
css
|
2021-05-19 15:11:47 +02:00 |
|
Laurent Destailleur
|
cf0da5cee7
|
css
|
2021-05-19 15:00:44 +02:00 |
|
Laurent Destailleur
|
8e39eff180
|
Look and feel v14
|
2021-05-18 18:18:00 +02:00 |
|
Laurent Destailleur
|
74f35177ff
|
Fix group by
|
2021-05-18 13:20:14 +02:00 |
|
Laurent Destailleur
|
2ef713bd5f
|
Merge branch 'develop' into look_feel_user_author_list
|
2021-05-18 12:27:30 +02:00 |
|
Laurent Destailleur
|
7b9161ec63
|
Merge pull request #17644 from bb2a/thirdparty_infos_list
Add popup thirdparty info in list
|
2021-05-18 12:15:51 +02:00 |
|
Laurent Destailleur
|
b6dbe45242
|
Fix permissions on page to move position of file
|
2021-05-18 01:58:54 +02:00 |
|
Anthony Berton
|
6fe9fe330d
|
delete fetch
|
2021-05-17 23:54:31 +02:00 |
|
Anthony Berton
|
58db723502
|
thirdparty info popup list
|
2021-05-17 23:27:33 +02:00 |
|
Anthony Berton
|
31cd71d8a3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list
|
2021-05-17 18:34:41 +02:00 |
|
Anthony Berton
|
0b7f474dd3
|
look_feel user author in list
|
2021-05-17 18:04:21 +02:00 |
|
Laurent Destailleur
|
608e4e8891
|
Merge pull request #17601 from ptibogxiv/patch-426
NEW report contact/adresses on credit note from invoice
|
2021-05-17 09:12:12 +02:00 |
|
Laurent Destailleur
|
4768729c09
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
|
2021-05-17 07:57:32 +02:00 |
|
stickler-ci
|
50d4d28c14
|
Fixing style errors.
|
2021-05-14 11:54:50 +00:00 |
|
Ferran Marcet
|
ce6df0ee4a
|
FIX: Filter of the dates in the lists is lost
|
2021-05-14 13:50:12 +02:00 |
|
stickler-ci
|
05ea8761a1
|
Fixing style errors.
|
2021-05-13 08:28:14 +00:00 |
|
ptibogxiv
|
b9336570ff
|
NEW report contact/adresses on credit note from invoice
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
|
2021-05-13 10:26:09 +02:00 |
|