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

23565 Commits

Author SHA1 Message Date
Florian HENRY
f17aa47ad6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-03-11 22:03:51 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev 
Replace gender and civility by a picto
 2021-03-11 21:36:16 +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
Laurent Destailleur
e8bbef8d2d
Update interface_50_modEventOrganization_EventOrganization.class.php 2021-03-11 21:35:22 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Damien BENOIT
420a3a73dd
Update html.form.class.php 2021-03-11 18:15:22 +01:00
Florian HENRY
3ae93679cf Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft 2021-03-11 16:59:13 +01:00
Florian HENRY
6742241639 better tranaction and condition 2021-03-11 16:55:49 +01:00
stickler-ci
345fe648b3 Fixing style errors. 2021-03-11 15:37:27 +00:00
Laurent Destailleur
c596eb91a8
Merge branch 'develop' into abb120358 2021-03-11 16:35:21 +01:00
lmarcouiller
9aa20585be Fix #16617 : fix event add when removing boxes 2021-03-11 10:10:20 +01:00
Bahfir Abbes
0158cbb893
Update security.lib.php 2021-03-11 04:02:30 +01:00
Laurent Destailleur
3007141b2b Fix phpcs 2021-03-10 20:40:34 +01:00
Laurent Destailleur
82d5c7289d Add property widgettype 2021-03-10 17:02:39 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop 
Update fork
 2021-03-10 16:53:35 +01:00
Laurent Destailleur
521e3b20dc Rename widget 2021-03-10 16:44:46 +01:00
Damien BENOIT
93675082d7
Update html.form.class.php 2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +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
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
b1f4c29fde Fix missing alias 2021-03-09 20:12:14 +01:00
Florian HENRY
7aec2fc02b create task 2021-03-09 18:52:52 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList 
Dev allow alias in common object get filed list
 2021-03-09 16:54:22 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00
Laurent Destailleur
1fe90091b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-09 15:35:25 +01:00
Laurent Destailleur
cf30e90b93 Work on inventory 2021-03-09 15:35:10 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php 2021-03-09 15:13:20 +01:00
Laurent Destailleur
b822f04cbb
Merge pull request #16593 from frederic34/patch-3 
fix unknown variable
 2021-03-09 15:08:11 +01:00
Laurent Destailleur
1b3aae1984 Fix regression 2021-03-09 12:17:32 +01:00
Laurent Destailleur
53f8ff060a Fix phpcs 2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList 2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a allow table alias into commonObject getFieldList 2021-03-09 10:21:32 +01:00
Frédéric FRANCE
de1cf54e2f
Update box_members_by_type.php 2021-03-09 00:20:28 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Laurent Destailleur
3b80b9dd75 Fix regression 2021-03-08 16:37:52 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex 2021-03-08 16:34:05 +01:00
Laurent Destailleur
24a0700426
Merge pull request #16573 from frederic34/box_index_societe 
can add box on thirparties index
 2021-03-08 16:25:46 +01:00
Laurent Destailleur
1aba0c2bc9 NEW Can set order of execution of hooks 2021-03-08 15:56:41 +01:00
lmarcouiller
b71a8c5d6f Close #15917 : boxes on ticket index 2021-03-08 15:26:35 +01:00
lmarcouiller
d8a74bad93 update for continuous integration 2021-03-08 13:58:23 +01:00
lmarcouiller
8c7764ed5d Move of 2 graph in boxes 2021-03-08 12:18:55 +01:00
Laurent Destailleur
ab89d85095 Fix for php8 2021-03-08 11:33:07 +01:00
ksar
ec8baa6bff Update commondocgenerator.class.php 
#16341
 2021-03-08 10:00:19 +01:00
Alexandre SPANGARO
2f86971f84 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-08 09:56:57 +01:00
Frédéric FRANCE
92754760f4
can add box on thirparties index 2021-03-06 16:38:07 +01:00
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +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
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
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
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
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
stickler-ci
06cabb35ec Fixing style errors. 2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
396fb3fae3 FIX: ldap: bad function comment 2021-03-05 11:21:04 +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
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +01:00
Laurent Destailleur
6eafc3b774 Clean code 2021-03-04 17:23:12 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0 
avoid warning into modulebuilder
 2021-03-04 16:52:47 +01:00
Laurent Destailleur
beb8dbcc01
Update project.lib.php 2021-03-04 16:48:25 +01:00
Laurent Destailleur
dcff298c5f FIX #16533 2021-03-04 15:57:03 +01:00
Christophe Battarel
53cf042a57 adapt tobatch import/export 2021-03-04 15:35:53 +01:00
Laurent Destailleur
98eb0fc969 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-04 15:34:44 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
stickler-ci
47dd477c61 Fixing style errors. 2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d Fix #16523 : return to backward compatibility 2021-03-04 10:33:18 +01:00
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28:41 +01:00
lmarcouiller
500f192a05 Fix #16523 : New column Contact assigned 2021-03-04 10:15:41 +01:00
Laurent Destailleur
5553bae3a1 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:44:01 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Laurent Destailleur
43e58f70a1
Merge pull request #16528 from frederic34/patch-4 
remove unused code
 2021-03-03 15:10:58 +01:00
Laurent Destailleur
d22f929779
Merge pull request #16526 from frederic34/patch-3 
fix unknown constant and variable
 2021-03-03 15:10:38 +01:00
Alexandre SPANGARO
59a2fb8ed5 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-03 14:08:40 +01:00
Frédéric FRANCE
d05c0b749a
remove unused code 2021-03-03 13:11:10 +01:00
Frédéric FRANCE
2d9f00eb57
Update commonobject.class.php 2021-03-03 12:24:44 +01:00
Laurent Destailleur
da8b67da83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-03 12:07:42 +01:00
Laurent Destailleur
5f8b52ffc9 Code comment 2021-03-03 12:05:43 +01:00
Laurent Destailleur
093eab188e Code comment 2021-03-03 12:02:57 +01:00
Frédéric FRANCE
a8bf47b9ce
fix unknown constant and variable 2021-03-03 12:02:48 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
889a496661 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-03 11:31:55 +01:00
Laurent Destailleur
b5d1e36ece Fix include 2021-03-03 11:31:40 +01:00
Laurent Destailleur
6fcec3e99b
Merge pull request #16522 from FHenry/13.0 
fix: warning on install
 2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c
Update functions.lib.php 2021-03-02 23:57:37 +01:00
Laurent Destailleur
7abf572f2d
Merge pull request #16512 from Hystepik/develop#1 
Fix #16432 : Update of getCountriesinEEC
 2021-03-02 23:56:37 +01:00
Laurent Destailleur
348b8d2ffe More phpunit tests 2021-03-02 23:55:41 +01:00
Florian HENRY
4e5849e50b remove debug 2021-03-02 23:13:05 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1 fix warning 2021-03-02 22:55:43 +01:00