Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

5891 Commits

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