lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,659 Commits 43 Branches 150 Tags 886 MiB
12.0
Commit Graph

77873 Commits

Author SHA1 Message Date
Laurent Destailleur
c9a46ab0cc
Merge pull request #18273 from aspangaro/12p17 
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
 2021-07-28 18:55:47 +02:00
Laurent Destailleur
bd731d9213
Merge pull request #18226 from FHenry/fix_addtimespend 
FIX: cannot add time spend when column ref is not displayed
 2021-07-28 17:38:04 +02:00
Alexandre SPANGARO
cd63ede35a Correctif date 2021-07-28 16:46:57 +02:00
Alexandre SPANGARO
7acebd28ca Add information 2021-07-28 14:08:53 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +02:00
Florian HENRY
a7cef1aa15 FIX: cannot add time spend when column ref is not displayed 2021-07-26 10:20:11 +02:00
Florian HENRY
e93a362a0d fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm 2021-07-23 18:33:18 +02:00
Gauthier PC portable 024
0fe46b53d8 FIX : method_exists needs object at first param 2021-07-13 15:18:40 +02:00
Alexandre SPANGARO
be62c2f7f4 FIX Problem of z-index with popup and top menu 2021-07-08 22:11:41 +02:00
Laurent Destailleur
a345d38320 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-06 15:24:01 +02:00
Marc de Lima Lucio
eea90cef56 FIX: holiday: balances not updated correctly with pgsql because of case sensitivity 2021-07-05 16:31:33 +02:00
Laurent Destailleur
d03cbd88ae Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-02 16:05:59 +02:00
Laurent Destailleur
a7f850dafb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-02 16:05:51 +02:00
Christophe Battarel
3c5bc3fef4 fix division by zero on of create 2021-07-02 11:53:32 +02:00
atm-arnaud
8772c53723 FIX deposit can create credit note in payment conf 2021-06-30 12:37:21 +02:00
Laurent Destailleur
ce18eff133 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-29 15:48:06 +02:00
Laurent Destailleur
e2c4a14939 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-29 15:47:58 +02:00
lvessiller
fa28a02d74 FIX update contact birthday alert 2021-06-28 11:03:22 +02:00
Maxime Kohlhaas
c3cbd29542 Fix #17836 : order delay warning in list was wrong, date_commande is deprecated 2021-06-27 09:04:47 +02:00
atm-lena
7eddf43aef FIX List and Create Companies Left Menus 2021-06-23 17:33:02 +02:00
Laurent Destailleur
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block 
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
 2021-06-23 10:48:22 +02:00
Laurent Destailleur
9c657206b3
Update linkedobjectblock.tpl.php 2021-06-23 10:47:51 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php 2021-06-23 10:47:23 +02:00
Alexandre SPANGARO
c8326c1365 FIX Accoutancy Limit date payment not register on purchases operations 2021-06-20 21:55:48 +02:00
Laurent Destailleur
51eaecdc6b Fix phpcs 2021-06-17 22:02:06 +02:00
Laurent Destailleur
98a0959b64 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-17 21:31:00 +02:00
Laurent Destailleur
e4056b8a1d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-17 21:30:50 +02:00
Laurent Destailleur
ce9dbfccd7
Merge pull request #17953 from atm-gauthier/fix_trackingnumber_line_not_displaied_if_empty 
FIX : Tracking number label shouldn't be displaied on "espadon" model…
 2021-06-17 13:36:42 +02:00
Gauthier PC portable 024
50bc832532 FIX : better correction 2021-06-17 10:48:48 +02:00
atm-lena
9769e33eab notigger parameter 2021-06-17 10:41:55 +02:00
atm-lena
5b8a6f1d71 Add Trigger "MAILING_DELETE" 2021-06-17 10:41:03 +02:00
Juanjo Menent
eeef78760a fix: Bad position of the printFieldListWhere hook 2021-06-17 10:29:43 +02:00
Gauthier PC portable 024
657972b79b FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty 2021-06-16 16:49:24 +02:00
stickler-ci
745ad8b403 Fixing style errors. 2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347 FIX : same thing on supplier orders 2021-06-14 17:01:59 +02:00
Laurent Destailleur
6078267f86 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
 2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee Clean code 2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line 
FIX clone invoice with acount line
 2021-06-14 14:41:05 +02:00
Adrien Raze
0f91c4cfa2 FIX : Allow to set bookmarks on list filtered by multiselect fields 2021-06-14 10:02:44 +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
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
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
0315f45198
Update permonth.php 2021-06-11 18:10:57 +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
Laurent Destailleur
c44a368213 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
5d6735f364
Merge pull request #17826 from ptibogxiv/patch-428 
Fix date_start of last subscription
 2021-06-10 13:01:07 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade 
FIX : childtablesoncascade doc
 2021-06-10 12:59:19 +02:00
Laurent Destailleur
b7ba9df6b4
Update societe.class.php 2021-06-10 12:59:04 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php 2021-06-10 12:58:42 +02:00
Laurent Destailleur
0c6f3a2616
Merge pull request #17862 from atm-gauthier/fix_rounding_on_formatted_tags 
FIX : auto rounding on "_FORMATED_" tags
 2021-06-10 12:50:50 +02:00
Laurent Destailleur
f5be9b6244
Merge pull request #17859 from aspangaro/12p14 
FIX Missing link to language file
 2021-06-10 12:19:19 +02:00
Laurent Destailleur
9ed7a3a5c5
Merge pull request #17863 from marc-dll/11.0_FIX_holiday_massaction_delete_right 
FIX: holiday list: bad right for mass deletion
 2021-06-10 12:13:10 +02:00
Laurent Destailleur
729c12a8e4
Merge pull request #17864 from DorianVabre/FIX_11.0_CSMSFile_count 
Fix: using strlen() instead of count() to measure a message length on CSMSFile
 2021-06-10 12:12:43 +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
lvessiller
c37c371392 FIX clone invoice with acount line 2021-06-09 17:18:01 +02:00
Dorian Vabre
0a23cf029d using strlen instead of count 2021-06-09 14:13:50 +02:00
Marc de Lima Lucio
5d9aa40065 FIX: holiday list: bad right for mass deletion 2021-06-09 12:40:34 +02:00
Gauthier PC portable 024
4b6fb7dd47 FIX : auto rounding on "_FORMATED_" tags 2021-06-09 12:26:28 +02:00
Alexandre SPANGARO
a4f3792cec FIX Missing link to language file 2021-06-09 07:42:05 +02:00
atm-greg
37433ffee7 verify vat change to update multiprice 2021-06-08 11:39:04 +02:00
Gauthier PC portable 024
e64c27e1c3 FIX : need to add payment sum to getlibstatus function in object linked block 2021-06-08 10:27:33 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
ptibogxiv
36accba5c9
Fix date_start of last subscription 2021-06-05 14:43:40 +02:00
Laurent Destailleur
d1d305e470
Merge pull request #17738 from frederic34/patch-11 
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
 2021-06-04 12:42:26 +02:00
Laurent Destailleur
9b0605f979 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-04 09:41:35 +02:00
Laurent Destailleur
164fe9fb4a
Merge pull request #17786 from FHenry/12_fix_ordersupplierstats 
FIX: order supplier stats by category now display figures
 2021-06-04 09:39:17 +02:00
atm-greg
f875bcfe09 update ->nom field if different from ->name 2021-06-02 10:30:48 +02:00
Florian HENRY
c91b9d613a FIX: order supplier stats by category now display figures 2021-06-01 15:30:17 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF 2021-05-27 00:02:01 +02:00
Laurent Destailleur
3187c096c3
Merge pull request #17731 from atm-adrien/FIX_add_parameters_for_user_DoActions_hook 
FIX : Add parameters (object and action) for user list DoActions hook
 2021-05-26 17:48:42 +02:00
Adrien Raze
9c83bdff51 FIX : Add parameters (object and action) for user list DoActions hook 2021-05-26 17:02:34 +02:00
Maxime Kohlhaas
b3a6bcd34f Fix Winfic accountancy export for due date 2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19 Fix Quadra accountancy export for due date 2021-05-26 14:59:28 +02:00
Laurent Destailleur
2ac9099e7d
Merge pull request #17618 from piernov/12.0-fix-addUserToGroupLDAP 
Fix add/del user to group modifies LDAP group
 2021-05-25 21:23:17 +02:00
Laurent Destailleur
6d637bf1e1
Merge pull request #17707 from FHenry/12_fix_export_balance 
fix: export balance with double quote
 2021-05-25 19:36:57 +02:00
piernov
60176f7f5e
Fix add/del user to group modifies LDAP group 
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
 2021-05-24 18:01:27 +02:00
Florian HENRY
7d223beae5 fix: export balance with doublequote 2021-05-24 12:51:58 +02:00
Laurent Destailleur
3359ae93d8
Merge pull request #17654 from atm-adrien/FIX_missing_hooks 
FIX : Missing hook in cibles.php (for mailing)
 2021-05-20 15:24:12 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
93558d5bbb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-05-20 14:58:57 +02:00
Laurent Destailleur
865ecf7a94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 14:58:50 +02:00
Laurent Destailleur
90443e26ac
Merge pull request #17660 from gmilad/gmilad-fix-17608-b11 
Fix issue #17608 for branch 11
 2021-05-20 14:30:30 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
gmilad
4bb18db905
Fix issue #17608 for branch 11 
Fix issue #17608 for branch 11
 2021-05-18 19:53:35 +02:00
gmilad
57732d4265
Fix issue #17608 for branch 10 
Fix issue #17608 for branch 10
 2021-05-18 19:45:15 +02:00
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +02:00
Laurent Destailleur
6b12dd4143 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-18 12:02:52 +02:00
Laurent Destailleur
6170b28c3b FIx #17651 2021-05-18 11:58:49 +02:00
Laurent Destailleur
df2297bca3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/api_users.class.php
 2021-05-17 19:21:58 +02:00
Laurent Destailleur
a865f49d72 Fix phpcs 2021-05-17 19:19:26 +02:00
Laurent Destailleur
c54e010126 Fix perms on API user 2021-05-17 16:16:45 +02:00
stickler-ci
a3aba28c95 Fixing style errors. 2021-05-17 10:06:41 +00:00
Dorian Vabre
547f1dd370 Fix: user rest api rights 2021-05-17 11:54:53 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Ferran Marcet
f923c70f38 Fix: Before there was no mistake 2021-05-17 10:17:54 +02:00
Laurent Destailleur
fd6147578a
Merge pull request #17611 from atm-maxime/fix/supplier_discount_replenish 
Fix use supplier relative discount in replenish order creation
 2021-05-17 09:44:39 +02:00
Laurent Destailleur
892a38e681 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 09:15:21 +02:00
Laurent Destailleur
592cfb5e93
Merge pull request #17602 from fmarcet/11.0 
FIX: Impossible to add multiple localtax2
 2021-05-17 09:13:58 +02:00
Laurent Destailleur
b8b2928dd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId 
Fix: properly set gid for Group LDAP synchro
 2021-05-17 07:14:25 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php 2021-05-16 11:33:07 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro 
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
 2021-05-15 18:01:34 +02:00
Maxime Kohlhaas
db32f882e8 Fix use of DatePropal instead of Date 2021-05-15 07:45:04 +02:00
Maxime Kohlhaas
acadef72c1 Fix use supplier relative discount in replenish order creation 2021-05-14 18:01:22 +02:00
Ferran Marcet
c577d1c51e FIX: Impossible to add multiple localtax2 2021-05-13 13:35:28 +02:00
Quentin VIAL-GOUTEYRON
56d78cf12a FIX missing town and zip filter in contract list sql request 2021-05-12 11:02:27 +02:00
Laurent Destailleur
8dc1e1cb33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-11 20:17:24 +02:00
Laurent Destailleur
3683461c40 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	.travis.yml
	htdocs/societe/consumption.php
 2021-05-11 20:17:15 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
John BOTELLA
2fda3b1b46
FIX ; var case 
On this page $datePrint is not used but $dateprint yes
 2021-05-08 13:53:20 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Laurent Destailleur
824a601014
Merge pull request #17507 from atm-john/11.0_fix_search_accent_in_description 
FIX : search accented words in product description (consumption page)
 2021-05-06 16:45:21 +02:00
Laurent Destailleur
9ce23ac6b2
Merge pull request #17494 from atm-john/fix_not_enabled_email_template 
FIX saving template email
 2021-05-06 16:22:19 +02:00
ATM john
63292255cc Fix search accented words in product description 2021-05-05 18:45:23 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
ATM john
6574e54a41 Fix saving template email 2021-05-04 18:09:13 +02:00
Laurent Destailleur
17cb441569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +02:00
ATM john
6e4962bb39 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection 2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8 Fix checkbox multiselect pre-selected value from get/post 2021-04-30 12:20:43 +02:00
Laurent Destailleur
27e2c69e4e
Merge pull request #17439 from atm-lena/11.0_FIX_ShowContactSearch_SQLError 
FIX SQL Error show_contacts : socialnetworks
 2021-04-30 12:03:40 +02:00
Laurent Destailleur
0d4eaca3e8
Merge pull request #17426 from daraelmin/daraelmin-patch-v11 
Fix wrong alias in natural_search v11-v14
 2021-04-30 11:58:53 +02:00
Laurent Destailleur
08c85a88c8
Merge pull request #17437 from daraelmin/daraelmin-patch-v11-2 
Fix logical test always false V11 to v14
 2021-04-30 11:57:58 +02:00
stickler-ci
81b964db45 Fixing style errors. 2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321 FIX SQL Error show_contacts : socialnetworks 2021-04-30 10:04:21 +02:00
daraelmin
749aeeb233
Fix $objp->subscription =="yes" 2021-04-29 23:16:21 +02:00
daraelmin
4174ebd9c0
Fix subscription =="yes" 2021-04-29 23:11:51 +02:00
daraelmin
965eb2d639
Fix logical test always false 
subscription is an integer and is set to 0 or 1. So subscription is never equal to "yes"
 2021-04-29 22:57:39 +02:00
daraelmin
68415322ec
Fix v11 wrong alias in natural_search 2021-04-29 10:00:54 +02:00
Laurent Destailleur
0a871546ee
Merge pull request #17379 from atm-adrien/FIX_add_function_price2num_to_productAlertStock_box_12.0 
FIX : Add function price2num for rounding values in productAlertStock…
 2021-04-27 18:45:26 +02:00
Adrien Raze
e8c2085abd FIX : Change parameters MF to MS for price2num() function 2021-04-27 09:24:22 +02:00
Laurent Destailleur
ea19747bc6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b Fix phpcs 2021-04-27 02:15:58 +02:00
Laurent Destailleur
c7f38c4cf0 Fix bad var 2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7 Fix bad merge 2021-04-27 02:09:43 +02:00
Laurent Destailleur
b3f8a6758e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:13 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
7a6edfd61f
Merge pull request #17295 from atm-gauthier/fix_adv_target_emailing_extrafields_link 
FIX : type link extrafield case for advanced target emailing
 2021-04-27 01:45:26 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options 
Add parameter "option" to hook formattachOptions
 2021-04-26 21:00:12 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Adrien Raze
c5775cc902 FIX : Add parameter to function price2num() 2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9 FIX : Add function price2num for rounding values in productAlertStock box 2021-04-23 11:11:47 +02:00
Marc de Lima Lucio
ce022ab36c FIX: payment validation: invoices PDF were no re-generated, make it with correct display options 2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470 FIX: payment creation: re-generate invoice PDF with correct display options 2021-04-22 15:56:12 +02:00
atm-greg
74345c4f21 fix warehouse label field edition 2021-04-19 16:03:22 +02:00
stickler-ci
318a783237 Fixing style errors. 2021-04-19 07:19:45 +00:00
Gauthier PC portable 024
8c428081ab FIX : test on link type 2021-04-19 09:17:33 +02:00
Gauthier PC portable 024
ff8aae1209 Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link 2021-04-19 09:16:06 +02:00
Gauthier PC portable 024
5b6439ca5e FIX : cast int 2021-04-19 09:15:47 +02:00
stickler-ci
37f44f4a07 Fixing style errors. 2021-04-16 14:58:57 +00:00
Gauthier PC portable 024
f8fcf7c16b FIX : type link extrafield case for advanced target emailing 2021-04-16 16:55:19 +02:00
Laurent Destailleur
e8bf09862f
Merge pull request #17152 from marc-dll/FIX_12.0_zero_packaging 
FIX: supplier order: error 500 when using packaging with product where it is not defined
 2021-04-09 13:51:16 +02:00
Gauthier PC portable 024
c35c15e782 FIX : test must be === and not == 2021-04-09 11:31:50 +02:00
Marc de Lima Lucio
7df09b6e9e FIX: esupplier order: error 500 when using packaging with product where it is not defined 2021-04-07 10:41:36 +02:00
ptibogxiv
bd88806982
Fix order status label in comm index page 2021-04-05 12:07:51 +02:00
Youvious
5e9ce734a7 Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE' (pcg_subtype) 2021-04-03 15:14:33 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
eabe5ae616 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:54 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
af593099df Clean string 2021-03-22 23:52:14 +01:00
Laurent Destailleur
d5865dbfcc
Merge pull request #16791 from Robin-Yann/12.0 
FIX: fix checkbox displayed according to module project setup parameters - work in progress
 2021-03-20 12:06:03 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen 2021-03-20 09:02:29 +01:00
Robin
26dc897042 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 11:12:49 +01:00
Robin
d852816101 FIX: fix checkbox displayed according to module project setup parameters 2021-03-19 09:54:11 +01:00
Robin
b3757a6f69 FIX: fix checkbox displayed according to module project setup parameters - work in progress 2021-03-18 11:07:48 +01:00
Laurent Destailleur
a29a9e5435 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-16 15:14:46 +01:00
Laurent Destailleur
66bbc7f54f
Merge pull request #16734 from AlexisLaurier/11.0 
correct nb_expedition count
 2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f correct nb_expedition count 2021-03-16 15:00:46 +01:00
Laurent Destailleur
d905d92434
Merge pull request #16637 from frederic34/patch-4 
force check if newref needed if project create fail
 2021-03-15 11:31:07 +01:00
Frédéric FRANCE
815a7683a2
force getnextref if project create fail 2021-03-12 16:48:43 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php 2021-03-10 15:29:05 +01:00
atm-lena
b798535af9 FIX create sociales : keep values error form 2021-03-10 14:15:03 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00
Laurent Destailleur
8b555d33e7
Merge pull request #16586 from atm-adrien/FIX/rouding_socialesCard_amount_on_card_updating 
FIX : Rounding amount on social charges card updating
 2021-03-08 16:30:53 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0 
fix: set class attribute at right place
 2021-03-06 11:18:02 +01:00
Laurent Destailleur
1ad04bb67a
Merge pull request #16548 from frederic34/patch-5 
Fix #16544
 2021-03-06 11:09:58 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Frédéric FRANCE
7543b63a6e
Fix #16544 2021-03-05 08:49:56 +01:00