Laurent Destailleur
|
a5034d44f7
|
$_POST war
|
2021-03-24 19:53:31 +01:00 |
|
Laurent Destailleur
|
37c04b794f
|
Add property "ticket group is public" in dicitonary of ticket groups.
|
2021-03-24 12:13:23 +01:00 |
|
Florian HENRY
|
ebe0b503f6
|
working on attendees
|
2021-03-23 22:12:20 +01:00 |
|
Laurent Destailleur
|
053fe4831a
|
Fix translations
|
2021-03-23 16:59:12 +01:00 |
|
Laurent Destailleur
|
a1366da130
|
FIX #yogosha5715
|
2021-03-23 03:45:17 +01:00 |
|
Laurent Destailleur
|
e3b019f923
|
Clean code
|
2021-03-23 01:32:17 +01:00 |
|
Laurent Destailleur
|
af593099df
|
Clean string
|
2021-03-22 23:52:14 +01:00 |
|
Laurent Destailleur
|
6063b02bf4
|
Fix #ygosha5698
|
2021-03-22 12:47:23 +01:00 |
|
Laurent Destailleur
|
6a0e0f4c06
|
Fix #ygosha5698
|
2021-03-22 12:10:51 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
stickler-ci
|
5af4b4673c
|
Fixing style errors.
|
2021-03-21 22:12:36 +00:00 |
|
Alexandre SPANGARO
|
0c2ada4299
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-21 23:08:01 +01:00 |
|
UT from dolibit
|
32cf5240f8
|
Create index.html
|
2021-03-21 22:17:50 +01:00 |
|
UT from dolibit
|
e6a2243627
|
Create index.html
|
2021-03-21 22:15:33 +01:00 |
|
UT from dolibit
|
6dc0d8202b
|
Create index.html
|
2021-03-21 22:14:13 +01:00 |
|
UT from dolibit
|
34b1b18a89
|
Create index.html
|
2021-03-21 22:12:19 +01:00 |
|
Laurent Destailleur
|
2a7b687fbf
|
Merge pull request #16918 from dolibit-ut/patch-151
Create index.html
|
2021-03-21 21:47:04 +01:00 |
|
Laurent Destailleur
|
4806d2f40b
|
Merge pull request #16916 from dolibit-ut/patch-149
Create index.html
|
2021-03-21 21:46:56 +01:00 |
|
Laurent Destailleur
|
ffb81d5acc
|
Merge pull request #16905 from dolibit-ut/patch-138
Create index.html
|
2021-03-21 21:46:49 +01:00 |
|
Laurent Destailleur
|
7f9199691a
|
Merge pull request #16908 from dolibit-ut/patch-141
Create index.html
|
2021-03-21 21:46:36 +01:00 |
|
Laurent Destailleur
|
4f025e419e
|
Merge pull request #16901 from dolibit-ut/patch-134
Create index.html
|
2021-03-21 21:46:29 +01:00 |
|
Laurent Destailleur
|
92b5d12574
|
Merge pull request #16903 from dolibit-ut/patch-136
Create index.html
|
2021-03-21 21:46:21 +01:00 |
|
Laurent Destailleur
|
2a25f3096c
|
Merge pull request #16902 from dolibit-ut/patch-135
Create index.html
|
2021-03-21 21:46:14 +01:00 |
|
Laurent Destailleur
|
449315c225
|
Merge pull request #16904 from dolibit-ut/patch-137
Create index.html
|
2021-03-21 21:46:07 +01:00 |
|
Laurent Destailleur
|
5ccbd62fc8
|
Merge pull request #16906 from dolibit-ut/patch-139
Create index.html
|
2021-03-21 21:45:59 +01:00 |
|
Laurent Destailleur
|
b798321f09
|
Merge pull request #16913 from dolibit-ut/patch-146
Create index.html
|
2021-03-21 21:45:53 +01:00 |
|
Laurent Destailleur
|
84487e4ef8
|
Merge pull request #16907 from dolibit-ut/patch-140
Create index.html
|
2021-03-21 21:45:46 +01:00 |
|
Laurent Destailleur
|
472fe901a7
|
Merge pull request #16909 from dolibit-ut/patch-142
Create index.html
|
2021-03-21 21:45:39 +01:00 |
|
Laurent Destailleur
|
ddea352092
|
Merge pull request #16910 from dolibit-ut/patch-143
Create index.html
|
2021-03-21 21:45:32 +01:00 |
|
Laurent Destailleur
|
d9ec217210
|
Merge pull request #16912 from dolibit-ut/patch-145
Create index.html
|
2021-03-21 21:45:25 +01:00 |
|
Laurent Destailleur
|
a78e62a16e
|
Merge pull request #16914 from dolibit-ut/patch-147
Create index.html
|
2021-03-21 21:45:18 +01:00 |
|
UT from dolibit
|
9eb50eee00
|
Create index.html
|
2021-03-21 21:40:37 +01:00 |
|
UT from dolibit
|
0241e2d449
|
Create index.html
|
2021-03-21 21:38:53 +01:00 |
|
UT from dolibit
|
98c2c59486
|
Create index.html
|
2021-03-21 21:36:41 +01:00 |
|
UT from dolibit
|
5b028d192d
|
Create index.html
|
2021-03-21 21:33:39 +01:00 |
|
UT from dolibit
|
9925cdcbee
|
Create index.html
|
2021-03-21 21:32:35 +01:00 |
|
UT from dolibit
|
d0cace4f2c
|
Create index.html
|
2021-03-21 21:32:05 +01:00 |
|
UT from dolibit
|
50672bfe31
|
Create index.html
|
2021-03-21 21:19:54 +01:00 |
|
UT from dolibit
|
2a069a0a2c
|
Create index.html
|
2021-03-21 21:19:12 +01:00 |
|
UT from dolibit
|
4b3b4d072a
|
Create index.html
|
2021-03-21 21:17:12 +01:00 |
|
UT from dolibit
|
2f957667ed
|
Create index.html
|
2021-03-21 21:16:32 +01:00 |
|
UT from dolibit
|
163b960da9
|
Create index.html
|
2021-03-21 21:15:40 +01:00 |
|
UT from dolibit
|
8ec3c4a5b5
|
Create index.html
|
2021-03-21 21:14:52 +01:00 |
|
UT from dolibit
|
21a2b4e222
|
Create index.html
|
2021-03-21 21:13:33 +01:00 |
|
UT from dolibit
|
e4921fa843
|
Create index.html
|
2021-03-21 21:11:01 +01:00 |
|
UT from dolibit
|
c0e7800251
|
Create index.html
|
2021-03-21 21:10:13 +01:00 |
|
UT from dolibit
|
ae91f3be63
|
Create index.html
|
2021-03-21 21:07:25 +01:00 |
|
Laurent Destailleur
|
800eeef868
|
Clean code
|
2021-03-21 18:20:37 +01:00 |
|
Laurent Destailleur
|
3c8bf2167b
|
Debug permissions
|
2021-03-21 18:01:43 +01:00 |
|
Laurent Destailleur
|
9900429fd0
|
Merge pull request #16889 from frederic34/adherent_to_member
rename files from adherent to member
|
2021-03-20 20:37:44 +01:00 |
|
Laurent Destailleur
|
e330c0f91a
|
Merge pull request #16883 from aspangaro/14a28
Uniformize information on modules
|
2021-03-20 19:49:33 +01:00 |
|
Laurent Destailleur
|
a2b3afb511
|
Merge branch 'develop' into 14a22
|
2021-03-20 19:48:43 +01:00 |
|
Laurent Destailleur
|
46aa01aea0
|
Fix permission on export of BOM and website
|
2021-03-20 19:15:15 +01:00 |
|
Frédéric FRANCE
|
f6e7285949
|
rename files from adherent to member
|
2021-03-20 19:06:15 +01:00 |
|
Alexandre SPANGARO
|
3669c374c2
|
Uniformize information on modules
|
2021-03-20 13:55:43 +01:00 |
|
Laurent Destailleur
|
e334e83a64
|
Merge branch 'develop' into 14a22
|
2021-03-20 13:42:54 +01:00 |
|
Laurent Destailleur
|
d8aa5f5eab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-20 12:43:07 +01:00 |
|
Laurent Destailleur
|
3d3a7bfd37
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2021-03-20 12:42:46 +01:00 |
|
Laurent Destailleur
|
ee84bef3b2
|
Merge pull request #16828 from frederic34/membersboxfix
fix new boxes add
|
2021-03-20 11:52:19 +01:00 |
|
Laurent Destailleur
|
25f1b82c34
|
Merge pull request #16859 from frederic34/patch-11
fix doxygen
|
2021-03-20 11:24:50 +01:00 |
|
Laurent Destailleur
|
5f0a2e648b
|
Merge pull request #16871 from frederic34/patch-19
fix doxygen
|
2021-03-20 11:15:48 +01:00 |
|
Laurent Destailleur
|
3ce4762710
|
Merge pull request #16873 from frederic34/patch-23
fix doxygen
|
2021-03-20 11:15:22 +01:00 |
|
Frédéric FRANCE
|
a8d8775328
|
fix doxygen
|
2021-03-20 10:30:26 +01:00 |
|
Frédéric FRANCE
|
dad7038a0d
|
fix doxygen
|
2021-03-20 10:22:34 +01:00 |
|
Frédéric FRANCE
|
8af1f278ae
|
fix doxygen
|
2021-03-20 10:19:03 +01:00 |
|
Frédéric FRANCE
|
1a2b22def4
|
fix doxygen
|
2021-03-20 09:14:52 +01:00 |
|
Alexandre SPANGARO
|
17d3b85ec4
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-20 07:47:54 +01:00 |
|
Alexandre SPANGARO
|
00e21caa42
|
NEW: Add a sub table to manage accountancy on product/company
|
2021-03-20 07:42:16 +01:00 |
|
Laurent Destailleur
|
be90f5f2de
|
Fix id of advanced perm
|
2021-03-19 15:00:22 +01:00 |
|
Frédéric FRANCE
|
7183bfeb94
|
fix new boxes add
|
2021-03-19 09:15:35 +01:00 |
|
Florian HENRY
|
df4a243f18
|
fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature
|
2021-03-18 17:13:34 +01:00 |
|
Alexandre SPANGARO
|
18d247026d
|
NEW: Add a sub table to manage product/societe
|
2021-03-18 17:08:55 +01:00 |
|
Frédéric FRANCE
|
1b4b48a634
|
fix php8 warning when upgrade reloads modules
|
2021-03-18 13:18:50 +01:00 |
|
Laurent Destailleur
|
e366d2c379
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
|
2021-03-16 14:57:04 +01:00 |
|
Laurent Destailleur
|
f514dec6ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
|
2021-03-16 14:50:06 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +01:00 |
|
Florian HENRY
|
177a6bfe4f
|
conference or booth card and list ok
|
2021-03-15 20:20:53 +01:00 |
|
Florian HENRY
|
17c49e6ce9
|
ongoinf card and list
|
2021-03-15 18:06:23 +01:00 |
|
Laurent Destailleur
|
2129adf129
|
Add more fields to llx_oauth_token
|
2021-03-15 13:25:08 +01:00 |
|
Christophe Battarel
|
090dc4f28a
|
Merge branch 'develop' into pr_batch_masks
|
2021-03-15 11:42:33 +01:00 |
|
Laurent Destailleur
|
382b810ba1
|
Fix phpcs
|
2021-03-15 00:18:26 +01:00 |
|
Laurent Destailleur
|
5faecef0e1
|
Look and feel v14
|
2021-03-13 18:56:02 +01:00 |
|
Christophe Battarel
|
c339af533d
|
fix conflict
|
2021-03-12 14:15:55 +01:00 |
|
Martin Neubauer
|
0db65597fd
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2021-03-12 13:58:00 +01:00 |
|
Martin Neubauer
|
5aaeb6742c
|
Add UPC support to built-in barcode generator
|
2021-03-12 13:54:27 +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
|
f9918dd51f
|
Code comment
|
2021-03-12 11:50:48 +01:00 |
|
Laurent Destailleur
|
b7a66769bb
|
Merge pull request #16603 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-11 21:35:39 +01:00 |
|
Christophe Battarel
|
229c581a25
|
try to fix sticker
|
2021-03-11 11:30:12 +01:00 |
|
Christophe Battarel
|
e8aacc7acf
|
try to fix sticker
|
2021-03-11 11:12:03 +01:00 |
|
Christophe Battarel
|
ba51c5dc70
|
differentiate masks for lot management and serial numbers management
|
2021-03-11 10:44:55 +01:00 |
|
Christophe Battarel
|
2c711f1a2d
|
add masks for batch
|
2021-03-11 10:02:31 +01:00 |
|
Laurent Destailleur
|
3007141b2b
|
Fix phpcs
|
2021-03-10 20:40:34 +01:00 |
|
Laurent Destailleur
|
514a9fb96a
|
Merge pull request #16561 from Hystepik/develop#1
Close #15917 : Improvement to ticket module
|
2021-03-10 15:49:20 +01:00 |
|
Laurent Destailleur
|
9ed128c6fa
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/class/html.formaccounting.class.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/langs/en_US/errors.lang
htdocs/product/card.php
|
2021-03-10 15:35:09 +01:00 |
|
Florian HENRY
|
7aec2fc02b
|
create task
|
2021-03-09 18:52:52 +01:00 |
|
Laurent Destailleur
|
9cb4dce485
|
Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing
|
2021-03-09 16:12:30 +01:00 |
|
Laurent Destailleur
|
a79a4e876d
|
Merge branch 'develop' into boxindex
|
2021-03-08 16:34:05 +01:00 |
|
lmarcouiller
|
b71a8c5d6f
|
Close #15917 : boxes on ticket index
|
2021-03-08 15:26:35 +01:00 |
|
lmarcouiller
|
8c7764ed5d
|
Move of 2 graph in boxes
|
2021-03-08 12:18:55 +01:00 |
|
Laurent Destailleur
|
315e66aa5a
|
Merge pull request #16537 from altairisfr/pr_sn_unicity
Unique serial number management
|
2021-03-06 11:22:44 +01:00 |
|
Laurent Destailleur
|
cbd6357f45
|
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter
NEW: LDAP: usergroup search can be filtered
|
2021-03-06 11:08:24 +01:00 |
|
Laurent Destailleur
|
0816cb9c04
|
Merge pull request #16560 from code-chicken/patch-12
Don't discard previously collected data
|
2021-03-06 10:57:18 +01:00 |
|
Laurent Destailleur
|
3cbced439a
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
|
2021-03-05 19:29:09 +01:00 |
|
Laurent Destailleur
|
1cd822bd75
|
Fix DOS attack on emailings wrappers
|
2021-03-05 14:54:17 +01:00 |
|
Rüdiger Hahn
|
18fc169cd0
|
Don't discard previously collected data
For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.
|
2021-03-05 11:32:03 +01:00 |
|
Marc de Lima Lucio
|
f731545af4
|
NEW: ldap: filter search on usergroups
|
2021-03-05 11:14:21 +01:00 |
|
Laurent Destailleur
|
83df996bc2
|
Fix english translation
|
2021-03-05 09:52:25 +01:00 |
|
Christophe Battarel
|
53cf042a57
|
adapt tobatch import/export
|
2021-03-04 15:35:53 +01:00 |
|
Frédéric FRANCE
|
d68de8617b
|
new box replace
|
2021-03-02 22:00:09 +01:00 |
|
Frédéric FRANCE
|
742c12f9d6
|
rename new boxes
|
2021-03-02 20:58:21 +01:00 |
|
Frédéric FRANCE
|
6cf8a46095
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-03-02 20:41:01 +01:00 |
|
Laurent Destailleur
|
a5bcc47d0d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-02 15:29:54 +01:00 |
|
Laurent Destailleur
|
a82ad6a02c
|
Fix phpcs
|
2021-03-02 15:29:27 +01:00 |
|
Laurent Destailleur
|
42329b10c9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
|
2021-03-02 15:27:20 +01:00 |
|
Laurent Destailleur
|
495c61c231
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
|
2021-03-02 15:12:41 +01:00 |
|
Laurent Destailleur
|
5fd341bbd3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
|
2021-03-02 15:11:18 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
stickler-ci
|
d20ba5a665
|
Fixing style errors.
|
2021-03-01 15:38:15 +00:00 |
|
Gauthier PC portable 024
|
861b583668
|
FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice
|
2021-03-01 16:34:42 +01:00 |
|
Frédéric FRANCE
|
8c45137b37
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-03-01 12:55:45 +01:00 |
|
Alexandre SPANGARO
|
94a861c1c8
|
Code enhanced - Standardize field name
|
2021-03-01 04:07:31 +01:00 |
|
Alexandre SPANGARO
|
ca7958f273
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 07:32:23 +01:00 |
|
Laurent Destailleur
|
5c0ea476e1
|
Look and feel v14
|
2021-02-27 12:45:07 +01:00 |
|
Laurent Destailleur
|
dd72a52e8f
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balancebymonth.php
htdocs/accountancy/class/accountancyexport.class.php
|
2021-02-26 19:23:23 +01:00 |
|
Laurent Destailleur
|
d5566dbf8f
|
FIX #16431
|
2021-02-26 19:18:03 +01:00 |
|
Frédéric FRANCE
|
96b0f3a25c
|
code syntax directory
|
2021-02-26 16:19:52 +01:00 |
|
Laurent Destailleur
|
5d0a0fe341
|
Clean code
|
2021-02-26 14:53:16 +01:00 |
|
Frédéric FRANCE
|
554e449e40
|
code syntax core directory
|
2021-02-23 22:03:23 +01:00 |
|
Florian HENRY
|
fa65956801
|
Merge branch 'develop' into dev_EventOrganisation_draft
|
2021-02-22 21:02:22 +01:00 |
|
Alexandre SPANGARO
|
7f4040e464
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 11:59:13 +01:00 |
|
Alexandre SPANGARO
|
22c936ba19
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 11:28:36 +01:00 |
|
Laurent Destailleur
|
f99232e66e
|
Merge branch 'develop' into 14a21
|
2021-02-22 11:18:07 +01:00 |
|
Alexandre SPANGARO
|
267b095786
|
Fix import/export
|
2021-02-22 06:09:33 +01:00 |
|
Alexandre SPANGARO
|
d7993253e7
|
Export
|
2021-02-22 05:33:40 +01:00 |
|
Alexandre SPANGARO
|
dfb6490bb4
|
Fix export
|
2021-02-22 05:24:39 +01:00 |
|
Alexandre SPANGARO
|
116a491ae1
|
Revert "Fix export"
This reverts commit 01e351e87e.
|
2021-02-22 05:23:02 +01:00 |
|
Alexandre SPANGARO
|
01e351e87e
|
Fix export
|
2021-02-22 05:19:48 +01:00 |
|
Florian HENRY
|
556ba2b369
|
statart card
|
2021-02-20 23:17:48 +01:00 |
|
Alexandre SPANGARO
|
3dcfe40e71
|
Code enhanced - Standardize field name #14697
|
2021-02-20 08:00:27 +01:00 |
|
Laurent Destailleur
|
3a073c75e7
|
Too verbose
|
2021-02-19 18:01:47 +01:00 |
|
Florian HENRY
|
e46d4ee75d
|
fix sample product import files
|
2021-02-19 18:01:36 +01:00 |
|
Florian HENRY
|
f111302a25
|
fix column count
|
2021-02-19 18:01:25 +01:00 |
|
Florian HENRY
|
32a360dd2a
|
fix sample xls file
|
2021-02-19 18:01:16 +01:00 |
|
Florian HENRY
|
527c32d79e
|
with new phpoffice col start at 1 not 0
|
2021-02-19 18:01:04 +01:00 |
|
Laurent Destailleur
|
db34481cf6
|
Merge pull request #16345 from FHenry/13_fix_column_excelfiles
FIX : Import Excel Failed and sample import file excel missing 1st column
|
2021-02-19 17:56:58 +01:00 |
|
Laurent Destailleur
|
fd0615b3fc
|
Too verbose
|
2021-02-19 17:56:04 +01:00 |
|
Laurent Destailleur
|
3ab80469ae
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-19 16:11:36 +01:00 |
|
Laurent Destailleur
|
574c0df427
|
Merge pull request #16338 from aspangaro/13p5
Fix module asset in development
|
2021-02-19 16:05:35 +01:00 |
|
Florian HENRY
|
6fe9b589ed
|
fix sample product import files
|
2021-02-18 12:50:15 +01:00 |
|
Florian HENRY
|
58a1904c15
|
fix column count
|
2021-02-18 12:48:06 +01:00 |
|
Florian HENRY
|
de2d5c7188
|
fix sample xls file
|
2021-02-18 12:24:24 +01:00 |
|
Florian HENRY
|
35dc1e7d4f
|
with new phpoffice col start at 1 not 0
|
2021-02-18 11:04:37 +01:00 |
|
stickler-ci
|
8673f7625f
|
Fixing style errors.
|
2021-02-17 17:36:29 +00:00 |
|
Florian HENRY
|
fc3cc915ee
|
new_add_field_product_export
|
2021-02-17 18:29:56 +01:00 |
|
Laurent Destailleur
|
32370bf63d
|
Look and feel v14
|
2021-02-15 20:13:38 +01:00 |
|
Laurent Destailleur
|
0bac454f25
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-15 16:40:45 +01:00 |
|
Laurent Destailleur
|
7b383b58c6
|
Trans
|
2021-02-15 16:35:51 +01:00 |
|
Laurent Destailleur
|
d183a7eedf
|
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
wip : Event Organization module - PR-1 - setup page #FoundationFunding
|
2021-02-15 15:59:19 +01:00 |
|
Laurent Destailleur
|
026259ebd7
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
|
2021-02-15 13:12:27 +01:00 |
|
Florian HENRY
|
02b698c128
|
move files to real diredtory
|
2021-02-14 17:09:23 +01:00 |
|
Laurent Destailleur
|
cd4d790d2b
|
Add parameters of batch into comment description
|
2021-02-12 17:15:23 +01:00 |
|
Laurent Destailleur
|
4a2cd0d509
|
Merge pull request #16253 from AlexisLaurier/13.0
contract - uses of multidir_output for file path
|
2021-02-11 19:00:20 +01:00 |
|
Laurent Destailleur
|
1b11d9d0e9
|
FIX payment term label on PDF
|
2021-02-11 17:48:53 +01:00 |
|
Alexis LAURIER
|
468f40743d
|
contract - use multidir_output
|
2021-02-10 13:18:55 +01:00 |
|
Philippe GRAND
|
66b06405d9
|
standardization, internationalisation
|
2021-02-09 14:20:10 +01:00 |
|
Philippe GRAND
|
44f2269764
|
standardization, internationalisation
|
2021-02-09 14:19:17 +01:00 |
|
Philippe GRAND
|
8fd7d3e586
|
standardization, internationalisation
|
2021-02-09 14:18:27 +01:00 |
|
Philippe GRAND
|
182563329f
|
standardization, internationalisation
|
2021-02-09 14:17:38 +01:00 |
|
Philippe GRAND
|
635260e59f
|
standardization, internationalisation
|
2021-02-09 14:16:47 +01:00 |
|
Philippe GRAND
|
663108d239
|
standardization, internationalisation
|
2021-02-09 14:16:17 +01:00 |
|
Philippe GRAND
|
8d9ae906c8
|
standardization, internationalisation
|
2021-02-09 14:15:45 +01:00 |
|
Philippe GRAND
|
e1bf624e45
|
standardization, internationalisation
|
2021-02-09 14:15:14 +01:00 |
|
Philippe GRAND
|
a2b5a3190d
|
standardization, internationalisation
|
2021-02-09 14:14:40 +01:00 |
|
Philippe GRAND
|
c1bbd076df
|
standardization, internationalisation
|
2021-02-09 14:13:49 +01:00 |
|
Philippe GRAND
|
1317b5cfac
|
standardization, internationalisation
|
2021-02-09 14:13:12 +01:00 |
|
Philippe GRAND
|
3e9a6818f2
|
standardization, internationalisation
|
2021-02-09 14:12:27 +01:00 |
|
Philippe GRAND
|
f47d5e6a69
|
standardization, internationalisation
|
2021-02-09 14:10:07 +01:00 |
|
Philippe GRAND
|
ef3e7fa65a
|
standardization, internationalisation
|
2021-02-09 14:09:35 +01:00 |
|
Philippe GRAND
|
2fc6d76029
|
standardization, internationalisation
|
2021-02-09 14:09:02 +01:00 |
|
Philippe GRAND
|
ee50cee862
|
standardization, internationalisation
|
2021-02-09 14:07:58 +01:00 |
|
Philippe GRAND
|
a50ecdd1aa
|
standardization, internationalisation
|
2021-02-09 14:06:55 +01:00 |
|
Philippe GRAND
|
fff2c1fbac
|
standardization, internationalisation
|
2021-02-09 14:06:22 +01:00 |
|
Philippe GRAND
|
4840fa8214
|
standardization, internationalisation
|
2021-02-09 14:05:19 +01:00 |
|
Philippe GRAND
|
858ebf5aaf
|
standardization, internationalisation
|
2021-02-09 14:04:38 +01:00 |
|
Philippe GRAND
|
a8b72c98a2
|
standardization, internationalisation
|
2021-02-09 14:03:13 +01:00 |
|
Philippe GRAND
|
ff0c105207
|
standardization, internationalisation
|
2021-02-09 14:01:50 +01:00 |
|
Philippe GRAND
|
55dd15cbf6
|
standardization, internationalisation
|
2021-02-09 14:01:10 +01:00 |
|
Philippe GRAND
|
11053fe0ed
|
standardization, internationalisation
|
2021-02-09 14:00:26 +01:00 |
|
Philippe GRAND
|
39c3bcd265
|
standardization, internationalisation
|
2021-02-09 13:58:26 +01:00 |
|
Laurent Destailleur
|
3b0268424b
|
Merge pull request #16227 from grandoc/new_branch_08_02_2021
Save the name of generated file as the main doc when generating a doc…
|
2021-02-09 13:24:02 +01:00 |
|
Laurent Destailleur
|
401b4f641d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
|
2021-02-08 22:13:50 +01:00 |
|
Philippe GRAND
|
f27dd77cb6
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-08 19:47:31 +01:00 |
|
Philippe GRAND
|
62d6666927
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-08 19:46:09 +01:00 |
|
Philippe GRAND
|
d9eb727c0f
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-08 19:44:46 +01:00 |
|
Philippe GRAND
|
f80da203e0
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-08 19:43:36 +01:00 |
|
Philippe GRAND
|
6b0bb90ab2
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-08 19:40:27 +01:00 |
|
Laurent Destailleur
|
c33fb4badc
|
Merge pull request #16219 from FHenry/dev_fix_continue
Add extrafileld value into return ajax
|
2021-02-08 16:57:03 +01:00 |
|
Florian HENRY
|
cb152b22df
|
fix ajax
|
2021-02-08 15:47:37 +01:00 |
|
Laurent Destailleur
|
5c64173bfa
|
Merge pull request #16209 from frederic34/barcodepicto
add barcode picto in left menu
|
2021-02-08 15:04:56 +01:00 |
|
Laurent Destailleur
|
026e454825
|
Merge pull request #16208 from frederic34/ecmpicto
add ecm picto in left menu
|
2021-02-08 15:04:42 +01:00 |
|
Alexandre SPANGARO
|
b8ea96ba57
|
Fix module asset in development
|
2021-02-08 05:39:07 +01:00 |
|
Frédéric FRANCE
|
e1a22b7209
|
add blockedlog picto in left menu
|
2021-02-07 22:18:34 +01:00 |
|
Frédéric FRANCE
|
3c8ddf917f
|
add barcode picto in left menu
|
2021-02-07 22:15:20 +01:00 |
|
Frédéric FRANCE
|
b43dfe1139
|
add ecm picto in left menu
|
2021-02-07 22:04:46 +01:00 |
|
Laurent Destailleur
|
fc30b91960
|
Fix warning
|
2021-02-07 21:56:57 +01:00 |
|
Laurent Destailleur
|
92e67b2c54
|
Merge pull request #16195 from frederic34/morepictomodule
add more picto for module
|
2021-02-07 20:01:36 +01:00 |
|
Laurent Destailleur
|
ec394a93f6
|
Merge pull request #16191 from grandoc/develop
fix typo
|
2021-02-07 19:59:54 +01:00 |
|
Frédéric FRANCE
|
b96e405717
|
add picto member
|
2021-02-06 17:18:00 +01:00 |
|
Frédéric FRANCE
|
3bcf795d55
|
add more picto for module
|
2021-02-06 14:44:08 +01:00 |
|
Frédéric FRANCE
|
eaaefe1382
|
5.5 to 5.6
|
2021-02-06 14:12:22 +01:00 |
|
Frédéric FRANCE
|
7860ffa28e
|
update phpmin version
|
2021-02-06 13:48:31 +01:00 |
|
Philippe GRAND
|
ce7a3ae2f0
|
fix typo
|
2021-02-06 13:11:58 +01:00 |
|
Philippe GRAND
|
04373fb531
|
fix typo
|
2021-02-06 13:11:08 +01:00 |
|
Philippe GRAND
|
bf211c6423
|
fix typo
|
2021-02-06 13:10:00 +01:00 |
|
Florian HENRY
|
fcb5b3900d
|
FIX: #16189, fix download/see check deposit PDF
|
2021-02-06 12:39:40 +01:00 |
|
Laurent Destailleur
|
3dedd81f37
|
Same width for all picto of menu
|
2021-02-06 11:56:27 +01:00 |
|
Laurent Destailleur
|
c1eba5a885
|
Merge pull request #16188 from frederic34/menuprefix
modules can add prefix for menu
|
2021-02-06 11:41:46 +01:00 |
|
Frédéric FRANCE
|
b487644cb7
|
sample use for margin module
|
2021-02-06 10:52:03 +01:00 |
|
Frédéric FRANCE
|
df67de08b1
|
modules can add prefix for menu
|
2021-02-06 10:16:07 +01:00 |
|
Laurent Destailleur
|
a2a2127953
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-06 01:17:16 +01:00 |
|
Laurent Destailleur
|
fd3354142b
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
|
2021-02-06 01:17:05 +01:00 |
|
Philippe GRAND
|
47ca631193
|
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
|
2021-02-05 18:09:36 +01:00 |
|
Philippe GRAND
|
5b5ea075e7
|
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
|
2021-02-05 18:07:02 +01:00 |
|
Philippe GRAND
|
5856f9e5cb
|
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
|
2021-02-05 18:04:46 +01:00 |
|
Philippe GRAND
|
4170332aee
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:58:54 +01:00 |
|
Philippe GRAND
|
0f196d7f19
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:56:57 +01:00 |
|
Philippe GRAND
|
e638c238c6
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:54:51 +01:00 |
|
Philippe GRAND
|
7c13428456
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:53:34 +01:00 |
|
Philippe GRAND
|
c03da95acb
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:52:12 +01:00 |
|
Philippe GRAND
|
d85c8c44fc
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:49:43 +01:00 |
|
Philippe GRAND
|
998c5b2ec3
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:42:33 +01:00 |
|
Philippe GRAND
|
c96d36cad3
|
Save the name of generated file as the main doc when generating a doc with this template
|
2021-02-05 17:39:22 +01:00 |
|
Laurent Destailleur
|
482ad20a4d
|
Log debug before archive logs
|
2021-02-05 16:14:42 +01:00 |
|
Laurent Destailleur
|
ac83cea83a
|
Fix avoid to run import twice by clicking on tab step6
Fix timeout for real import step
|
2021-02-05 14:34:04 +01:00 |
|
Laurent Destailleur
|
f301635681
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2021-02-03 21:02:32 +01:00 |
|
Laurent Destailleur
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +01:00 |
|
Laurent Destailleur
|
217989d0e2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-02 15:37:40 +01:00 |
|
Laurent Destailleur
|
6b32fd33fd
|
Fix export with excell
|
2021-02-02 13:33:44 +01:00 |
|
Laurent Destailleur
|
2e9656a5b2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
|
2021-02-02 03:26:20 +01:00 |
|
Laurent Destailleur
|
f5df3b1d69
|
Clean code to try to fix #16123
|
2021-02-02 01:30:23 +01:00 |
|
Laurent Destailleur
|
daf88944f8
|
FIX #16118 Timezone problem on some fields
|
2021-02-02 00:19:41 +01:00 |
|
Laurent Destailleur
|
6fe5c2f599
|
Merge pull request #16109 from grandoc/new_branch_30_01_2021
missing declaration
|
2021-01-30 13:08:56 +01:00 |
|
Philippe GRAND
|
e584792382
|
missing declaration
|
2021-01-30 12:57:06 +01:00 |
|
Laurent Destailleur
|
1063b97c22
|
Close #16099 Close #16098
|
2021-01-30 12:55:38 +01:00 |
|
Philippe GRAND
|
0f19a11ebe
|
missing declaration
|
2021-01-30 12:54:10 +01:00 |
|
Laurent Destailleur
|
06b0b0ac66
|
Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE
Bug Photo in propal
|
2021-01-30 12:51:33 +01:00 |
|
Anthony Berton
|
e48fc6c3d0
|
Update pdf_cyan.modules.php
|
2021-01-29 13:51:06 +01:00 |
|
Anthony Berton
|
77b0075d71
|
Update pdf_azur.modules.php
|
2021-01-29 10:50:11 +01:00 |
|
Anthony Berton
|
720a11877d
|
Update pdf_azur.modules.php
|
2021-01-29 10:48:58 +01:00 |
|