Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 17:42:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
58a73e7b4c871f1dc76cf4a7bbf8f989d762583f
dolibarr/htdocs/admin
History
florian HENRY dd9896516b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/margin/agentMargins.php
	htdocs/product/stock/movement_card.php
	htdocs/projet/tasks/time.php
	htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
..
dolistore
wip
2019-02-10 11:08:48 +01:00
menus
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-13 11:21:20 +01:00
system
wip
2019-01-27 23:31:37 +01:00
tools
fix phpcs
2019-02-06 15:56:13 +01:00
accountant.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
agenda_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
agenda_extsites.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
agenda_other.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-31 18:27:27 +01:00
agenda_reminder.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
agenda_xcal.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
agenda.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
bank_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
bank.php
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
barcode.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
boxes.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
chequereceipts.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
clicktodial.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
commande_fournisseur_dispatch_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
commande.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
company.php
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
compta.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
confexped.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
const.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
contract.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
dav.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
defaultvalues.php
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-12 13:39:39 +01:00
delais.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
dict.php
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
ecm.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
emailcollector_card.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
emailcollector_list.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
events.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
expedition_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
expedition.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
expeditiondet_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
expensereport_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
expensereport_ik.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
expensereport_rules.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
expensereport.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
export.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
external_rss.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
facture.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
fckeditor.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
fichinter.php
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
geoipmaxmind.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
holiday.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
ihm.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
index.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
ldap_contacts.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
ldap_groups.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
ldap_members_types.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
ldap_members.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
ldap_users.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
ldap.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
limits.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
livraison_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
livraison.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
livraisondet_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
loan.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
mailing.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
mailman.php
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
mails_emailing.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
mails_senderprofile_list.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
mails_templates.php
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 15:16:44 +01:00
mails.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
menus.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
modulehelp.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
modules.php
wip
2019-01-27 23:31:37 +01:00
multicurrency.php
update with html5 compliant code
2019-01-22 11:51:03 +01:00
notification.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
oauth.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
oauthlogintokens.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
openinghours.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
order_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
orderdet_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
payment.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
pdf.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
perms.php
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
prelevement.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
propal.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
proxy.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
receiptprinter.php
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
reception_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
reception_setup.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
resource_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
resource.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
salaries.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
security_file.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
security_other.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
security.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
sms.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
socialnetworks.php
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
spip.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
stock.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
supplier_invoice.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
supplier_order.php
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
supplier_payment.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
supplier_proposal.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
supplierinvoice_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
supplierinvoicedet_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
supplierorder_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
supplierorderdet_extrafields.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
syslog.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
taxes.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
ticket_extrafields.php
FIX replace deprecated "print_titre" with "load_fiche_titre"
2018-12-25 08:36:42 +01:00
ticket.php
update with html5 compliant code
2019-01-17 14:19:15 +01:00
translation.php
first parameter of print_liste_field_titre was translated
2019-02-10 17:30:34 +01:00
triggers.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
user.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
usergroup.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
website_options.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
website.php
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
workflow.php
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00