Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
95,766 Commits 36 Branches 189 Tags
315e66aa5af71acfa33ae2d76eda2bc2d6a9c4a5
Commit Graph

8214 Commits

Author SHA1 Message Date
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
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
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
acea36acf2 better check for unicity 2021-03-05 08:39:30 +01:00
Laurent Destailleur
aee6d78928 Debug split of payment salary into salary + payment 2021-03-04 21:33:29 +01:00
Laurent Destailleur
b92bfb007f Merge pull request #16520 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-04 17:06:57 +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
dcff298c5f FIX #16533 2021-03-04 15:57:03 +01:00
Christophe Battarel
6a242edd8b check unicity of serial number 2021-03-04 15:29:47 +01:00
Gauthier PC portable 024
845b1c6c94 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:35:38 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +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
f219c9454a Merge pull request #16251 from Hystepik/develop#5 
Close #16218 : new button sitemap file
 2021-03-02 14:56:10 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Laurent Destailleur
b2cfc431bc Merge pull request #16489 from aspangaro/13p7 
FIX: Total_ht not show in contract link element
 2021-03-01 14:07:29 +01:00
Laurent Destailleur
5cddd0465c Fix trans 2021-03-01 13:25:54 +01:00
Laurent Destailleur
81f1bee10c Fix option DONATION_USE_THIRDPARTIES 2021-03-01 11:18:14 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Laurent Destailleur
a68721c5b4 Fix missing translation 2021-03-01 10:58:06 +01:00
Hystepik
460bc2dbde Merge branch 'develop' into develop#5 2021-03-01 09:03:38 +01:00
Alexandre SPANGARO
3b1a9cd668 FIX: Total_ht not show in contract link element 2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Laurent Destailleur
747acd6764 Trans 2021-02-27 18:53:27 +01:00
Florian HENRY
eb17ae5fe2 fix event type select 2021-02-27 14:13:42 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +01:00
Laurent Destailleur
84219689a6 Look and feel v14 2021-02-27 02:00:00 +01:00
atm-lena
292076e5dd Ajout conf qui permet de décocher / cocher par défaut le paiement automatique des salaires 2021-02-26 15:59:27 +01:00
Gauthier PC portable 024
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Laurent Destailleur
c4e98486f7 Trans 2021-02-26 15:15:55 +01:00
Laurent Destailleur
b95fd1697f Merge pull request #16434 from altairisfr/serials_pr 
differentiate serial numbers from lot management
 2021-02-26 15:06:35 +01:00
Christophe Battarel
4aaf9e133a change translation 2021-02-26 11:51:23 +01:00
Christophe Battarel
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Nicolas
49c0967a3e NEW option for Takepos to show the total price without tax 2021-02-24 15:48:15 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Laurent Destailleur
0009ce1646 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-23 14:49:23 +01:00
Laurent Destailleur
888c072af0 NEW Can set a percentage when creating an invoice from another object 2021-02-23 14:48:54 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
912f9f9bdb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/actions_massactions.inc.php
 2021-02-22 15:54:24 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Florian HENRY
be34fb4541 tab event ok 2021-02-21 12:32:16 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +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