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

5598 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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