Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

9249 Commits

Author SHA1 Message Date
Laurent Destailleur
af5db0f5fa Look and feel v14 2021-03-12 15:34:31 +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
Damien BENOIT
420a3a73dd Update html.form.class.php 2021-03-11 18:15:22 +01:00
lmarcouiller
9aa20585be Fix #16617 : fix event add when removing boxes 2021-03-11 10:10:20 +01:00
Damien BENOIT
2b33bb2d04 Merge pull request #11 from Dolibarr/develop 
Update fork
 2021-03-10 16:53:35 +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
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
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
3cb072f67a Update commonobject.class.php 2021-03-09 15:13:20 +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
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
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
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
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
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
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +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
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +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
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
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
43e58f70a1 Merge pull request #16528 from frederic34/patch-4 
remove unused code
 2021-03-03 15:10:58 +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
Frédéric FRANCE
a8bf47b9ce fix unknown constant and variable 2021-03-03 12:02:48 +01:00
Frédéric FRANCE
6cf8a46095 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
lvessiller
66ad8fbb24 FIX select list dependancies on common object (FIX #16510) 2021-03-02 17:21:55 +01:00
Laurent Destailleur
c81d5ff4d0 Introduce a variable to cache some data. 2021-03-02 16:13:00 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +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
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +01:00