lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92,073 Commits 43 Branches 150 Tags 886 MiB
084b2411df
Commit Graph

22157 Commits

Author SHA1 Message Date
Regis Houssin
bd8faae9c1 FIX missing "enabled" value of extrafield after update 2020-11-20 15:59:50 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop 
Update fork
 2020-11-20 13:53:43 +01:00
Laurent Destailleur
07c192efb8
Merge pull request #15457 from frederic34/patch-22 
Update ldap.class.php
 2020-11-20 13:37:24 +01:00
Frédéric FRANCE
b4a5134a7f
doxygen 2020-11-19 22:25:02 +01:00
Frédéric FRANCE
5d4d7c99d6
Update ldap.class.php 
The variable $result seems to be never defined.
 2020-11-19 22:07:32 +01:00
Frédéric FRANCE
efa5c89c45
Update rssparser.class.php 
The variable $**** does not seem to be defined for all execution paths leading up to this point.
 2020-11-19 22:03:13 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
aa7383f3d4 Fix warning 2020-11-19 18:15:40 +01:00
Laurent Destailleur
0760a268f6 Fix warning 2020-11-18 22:25:03 +01:00
Laurent Destailleur
83eaf16a22 Fix css 2020-11-18 16:23:08 +01:00
Laurent Destailleur
348185ff15 Fix js error 2020-11-18 16:04:05 +01:00
Laurent Destailleur
e78b9a421d Fix sql 2020-11-18 13:14:29 +01:00
Laurent Destailleur
0dbacab68f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-18 13:12:12 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts 
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
 2020-11-18 13:12:03 +01:00
Laurent Destailleur
8d8f0026c2 Fix switch date to datetime 2020-11-18 13:06:30 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423 
Fix for #15423
 2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php 2020-11-18 12:45:37 +01:00
Laurent Destailleur
95460e6372
Merge pull request #15422 from frederic34/patch-10 
add optional tag which list all other tags in odt substitutions
 2020-11-18 12:44:25 +01:00
Laurent Destailleur
68df96218f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-18 12:37:33 +01:00
Laurent Destailleur
2529448f1b Fix path to files 2020-11-18 12:37:18 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8 
fix dir for member photo in odt tag
 2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php 2020-11-18 12:04:41 +01:00
kamel
73b35f334e NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox) 
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec FIX Protection to avoid duplicate submit when creating a payment. 2020-11-17 18:39:34 +01:00
Laurent Destailleur
3e4c6b9222 Fix warning 2020-11-17 13:13:11 +01:00
Frédéric FRANCE
3b1f50d5fc
Update functions.lib.php 2020-11-17 11:58:11 +01:00
Frédéric FRANCE
bf390ceb4d
Update doc_generic_member_odt.class.php 2020-11-17 11:56:11 +01:00
Frédéric FRANCE
fcfd630f84
Update doc_generic_user_odt.modules.php 2020-11-17 11:55:05 +01:00
Frédéric FRANCE
fb5385180f
Update functions.lib.php 2020-11-17 11:54:18 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
548a25b005 Fix use of token 2020-11-16 14:36:23 +01:00
Laurent Destailleur
ca02ac9e45 Remove warning for php8 2020-11-16 13:00:18 +01:00
Laurent Destailleur
ac5fa6c6df Clean code 2020-11-16 12:54:16 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Laurent Destailleur
65144f4d5a fix warning 2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759 Fix for #15423 2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd
Update commondocgenerator.class.php 2020-11-15 23:58:35 +01:00
Frédéric FRANCE
d114c56672
add a tag which list all other tags in odt user 2020-11-15 23:49:16 +01:00
Frédéric FRANCE
35653bb855
fix dir for member photo in odt tag 2020-11-15 23:45:13 +01:00
Laurent Destailleur
e2ea25fd78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-15 17:29:31 +01:00
Laurent Destailleur
cbe9fec51d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/ticket/list.php
 2020-11-15 17:29:19 +01:00
Laurent Destailleur
8e87729040
Merge pull request #15416 from frederic34/patch-25 
doxygen
 2020-11-15 17:06:34 +01:00
Laurent Destailleur
acfee5a0e1
Merge pull request #15415 from frederic34/patch-24 
doxygen
 2020-11-15 17:05:55 +01:00
Laurent Destailleur
041de0843a
Merge pull request #15414 from frederic34/patch-23 
doxygen
 2020-11-15 17:05:39 +01:00
Laurent Destailleur
27f3287ac4
Merge pull request #15413 from frederic34/patch-22 
doxygen
 2020-11-15 17:05:22 +01:00
Laurent Destailleur
c4094357c2
Merge pull request #15412 from frederic34/patch-21 
doxygen
 2020-11-15 17:05:03 +01:00
Laurent Destailleur
a1bdce06f5
Merge pull request #15411 from frederic34/patch-20 
doxygen
 2020-11-15 17:04:45 +01:00
Laurent Destailleur
db357da9a7
Merge pull request #15410 from frederic34/patch-19 
doxygen
 2020-11-15 17:04:17 +01:00
Laurent Destailleur
31c73403c0
Update pdf_eratosthene.modules.php 2020-11-15 17:04:07 +01:00
Laurent Destailleur
d0cf558604
Merge pull request #15409 from frederic34/patch-18 
doxygen
 2020-11-15 17:02:54 +01:00
Laurent Destailleur
ed6204183d
Merge pull request #15408 from frederic34/patch-17 
doxygen
 2020-11-15 17:00:54 +01:00
Laurent Destailleur
011e786996
Update pdf_sepamandate.modules.php 2020-11-15 17:00:37 +01:00
Laurent Destailleur
0db18136a5
Merge pull request #15407 from frederic34/patch-15 
doxygen
 2020-11-15 16:59:47 +01:00
Laurent Destailleur
c0ce41dc0d
Merge pull request #15406 from frederic34/patch-14 
doxygen
 2020-11-15 16:59:25 +01:00
Laurent Destailleur
89a77fad2c Fix warning 2020-11-15 16:56:30 +01:00
Laurent Destailleur
5c15162c40 Fix warning 2020-11-15 15:10:15 +01:00
Laurent Destailleur
2e0e42e918 Fix warning 2020-11-15 14:37:21 +01:00
Laurent Destailleur
9fe8c003a4
Merge pull request #15398 from frederic34/odtformembers 
Add odt for members
 2020-11-15 13:19:43 +01:00
Frédéric FRANCE
41906fb5ee
Update pdf_cyan.modules.php 2020-11-14 22:15:05 +01:00
Frédéric FRANCE
92c28efe42
doxygen 2020-11-14 22:12:05 +01:00
Frédéric FRANCE
da0bdd0907
doxygen 2020-11-14 22:04:14 +01:00
Frédéric FRANCE
b994d0d84b
doxygen 2020-11-14 21:26:18 +01:00
Frédéric FRANCE
518ad097d0
Update pdf_sponge.modules.php 2020-11-14 21:21:58 +01:00
Frédéric FRANCE
9075e30a94
doxygen 2020-11-14 21:19:28 +01:00
Frédéric FRANCE
d6afdda8fe
Update pdf_rouget.modules.php 2020-11-14 21:09:02 +01:00
Frédéric FRANCE
0b097c74fa
Update pdf_merou.modules.php 2020-11-14 21:07:34 +01:00
Frédéric FRANCE
84ea018d81
doxygen 2020-11-14 21:05:53 +01:00
Frédéric FRANCE
c12c0a0d2f
Update pdf_strato.modules.php 2020-11-14 20:50:15 +01:00
Frédéric FRANCE
9c258b5dd4
Update pdf_eratosthene.modules.php 2020-11-14 20:46:49 +01:00
Frédéric FRANCE
e1c148a994
doxygen 2020-11-14 20:44:44 +01:00
Frédéric FRANCE
1db8afb4a9
doxygen 2020-11-14 20:40:17 +01:00
Frédéric FRANCE
a2fc7ce8c9
doxygen 2020-11-14 20:37:54 +01:00
Frédéric FRANCE
50e3fffbd8
doxygen 2020-11-14 20:35:52 +01:00
Frédéric FRANCE
d5f93e8c35
Update pdf_typhon.modules.php 2020-11-14 20:26:13 +01:00
Frédéric FRANCE
61d72b53be
doxygen 2020-11-14 20:24:26 +01:00
Frédéric FRANCE
30f89b1216
doxygen 2020-11-14 18:37:05 +01:00
Laurent Destailleur
b3e03c6991 Fix css for public pages 2020-11-14 18:11:46 +01:00
Mikaël MARTIN
0c37d31e04
Update box_supplier_orders_awaiting_reception.php 2020-11-14 13:01:36 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers 2020-11-14 00:56:21 +01:00
Laurent Destailleur
7da2d6cda2
Merge pull request #15391 from frederic34/patch-8 
doxygen
 2020-11-14 00:48:52 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members 2020-11-14 00:48:13 +01:00
Laurent Destailleur
c7b2577bb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-14 00:47:42 +01:00
Laurent Destailleur
3c5ef18b36 FIX #15390 2020-11-14 00:47:28 +01:00
Laurent Destailleur
ea23d328c3
Merge pull request #15396 from frederic34/patch-18 
fix member status in box
 2020-11-14 00:39:59 +01:00
Laurent Destailleur
8970fbca79
Merge pull request #15397 from frederic34/patch-19 
can upload odt model for user
 2020-11-14 00:39:44 +01:00
Frédéric FRANCE
70f1ed53f8
can upload odt model for user 2020-11-13 22:51:10 +01:00
Frédéric FRANCE
cce6afbeea
fix member status in box 2020-11-13 22:22:51 +01:00
Frédéric FRANCE
2f3ff6628d
The variable $obj does not seem to be defined 
The variable $obj does not seem to be defined for all execution paths leading up to this point.
 2020-11-13 20:51:48 +01:00
Frédéric FRANCE
42ddf7e27b
doxygen 2020-11-13 20:45:03 +01:00
Laurent Destailleur
86481d16d0 Clean code 2020-11-13 15:02:49 +01:00
Laurent Destailleur
0d19d2d5e4
Merge pull request #15372 from glu000/patch-1 
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
 2020-11-13 10:03:46 +01:00
Laurent Destailleur
5498800ad6
Update commonobject.class.php 2020-11-13 10:02:34 +01:00
Laurent Destailleur
b91123a84c
Merge pull request #15368 from cfoellmann/fix-new-contact-button 
fix new company in contacts template file
 2020-11-13 10:00:09 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Günter Lukas
2da8fb75a8
Fix #15371 
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
 2020-11-12 15:59:42 +01:00
Laurent Destailleur
754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/modUser.class.php
 2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
02158928cc FIX #15365 export of extrafields for user and resources 2020-11-12 14:11:59 +01:00
Christian Foellmann
2061d0f858 fix new company in contacts template file 2020-11-12 14:03:18 +01:00
Laurent Destailleur
1dbc91e343 Clean code 2020-11-12 13:44:57 +01:00