Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,016 Commits 36 Branches 189 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

1887 Commits

Author SHA1 Message Date
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +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
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Laurent Destailleur
a6bc218280 Look and feel v14 2021-02-28 21:34:27 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
1149de1aca FIX #16485 2021-02-28 13:15:24 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Laurent Destailleur
2673e93dfc Update card_presend.tpl.php 2021-02-22 11:19:47 +01:00
Daniel
7bbf1b4841 Fix Formatting 2021-02-22 10:04:29 +01:00
Daniel
38e1264588 For more flexible salutation in some languages the folloing Variables 
are availible

__CONTACT_LASTNAME_XXX__
__CONTACT_FIRSTNAME_XXX__
__CONTACT_SALUTATION_XXX__
 2021-02-22 09:56:48 +01:00
Laurent Destailleur
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +01:00
Laurent Destailleur
fd5fe5b427 Look and feel 2021-02-15 14:38:28 +01:00
Laurent Destailleur
7e7d393f30 Look and feel v14 2021-02-15 14:19:05 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
49f8ff5708 FIX #16286 2021-02-15 12:18:09 +01:00
Laurent Destailleur
ee6bc80242 Fix phpcs 2021-02-11 01:59:13 +01:00
Laurent Destailleur
88550ab417 Look and feel v14 2021-02-10 18:03:45 +01:00
Laurent Destailleur
c875ad9a1c FIX #16240 2021-02-10 02:17:01 +01:00
Laurent Destailleur
afeeb40e2e Fix show property "enabled" of extrafields 2021-02-10 00:18:00 +01:00
Laurent Destailleur
0a2ace81ff Fix phpcs 2021-02-09 18:15:32 +01:00
Laurent Destailleur
5e9065390a Merge pull request #16228 from FHenry/dev_new_autoload_product_extrafield_line_createtpl 
NEW:add hidden option to auto load input line extrafield into new lines
 2021-02-09 13:24:53 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Florian HENRY
1e6144a99d fix indent 2021-02-08 19:59:18 +01:00
Florian HENRY
b6b736c402 NEW:add hidden option to auto load input line extrafield into new lines 2021-02-08 19:56:34 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Raphael Schweizer
0be168561f prevent browsers from storing / suggesting old captchas 2021-02-06 16:10:05 +01:00
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
atm-lena
c5f73ec12a Resolve ret 2021-02-04 10:42:42 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
 2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
Laurent Destailleur
e6deed1601 Fix collapse 2021-02-01 15:40:59 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
2baeec1537 Merge pull request #15964 from FHenry/12.0 
extrafeild selllist can be use with string fk
 2021-01-18 18:53:01 +01:00
Florian HENRY
58eeb7152b Merge branch '12.0' into 13.0 2021-01-18 09:19:05 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00
Florian HENRY
014d3cc114 better fix 2021-01-18 09:08:54 +01:00
Laurent Destailleur
2859070c5c Fix filet on extrafields date 2021-01-17 15:47:43 +01:00
Laurent Destailleur
2f69a380be Fix syntax error 2021-01-16 16:06:49 +01:00
Laurent Destailleur
68302d74ba Fix look and feel v14 2021-01-16 14:10:37 +01:00
kevin
fb14f7c0b8 Modify GETPOST parameters to match with v12 2021-01-15 14:40:55 +01:00
Florian HENRY
cd62c9ed6d Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-15 08:11:30 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Florian HENRY
1cc88794b5 merge from 12.0 because this bug comme from it 2021-01-12 21:48:34 +01:00