Christophe Battarel c339af533d fix conflict

2021-03-12 14:15:55 +01:00

..

accountancy

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-10 15:35:09 +01:00

adherents

Add property widgettype

2021-03-10 17:02:39 +01:00

admin

Clean code

2021-03-10 16:41:48 +01:00

api

…

asset

…

asterisk

…

barcode

…

blockedlog

…

bom

Fix #16524 : Add support disassemble BOM

2021-03-05 09:47:38 +01:00

bookmarks

…

cashdesk

…

categories

…

collab

…

comm

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-08 19:31:47 +01:00

commande

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-03 11:37:34 +01:00

compta

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-08 19:31:47 +01:00

conf

…

contact

Fix look and feel v13

2021-03-09 17:01:20 +01:00

contrat

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-03 11:37:34 +01:00

core

fix conflict

2021-03-12 14:15:55 +01:00

cron

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-05 19:29:09 +01:00

custom

remove multicompany

2021-03-11 10:59:58 +01:00

datapolicy

…

dav

…

debugbar

…

delivery

…

don

Merge pull request #16513 from AlexisLaurier/develop

2021-03-02 19:15:22 +01:00

ecm

…

emailcollector

…

eventorganization

Fix phpcs

2021-03-04 17:57:08 +01:00

expedition

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-05 19:29:09 +01:00

expensereport

…

exports

…

externalsite

…

fichinter

FIX #16503

2021-03-02 23:09:55 +01:00

fourn

Merge pull request #16537 from altairisfr/pr_sn_unicity

2021-03-06 11:22:44 +01:00

ftp

…

holiday

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-10 15:35:09 +01:00

hrm

…

imports

…

includes

…

install

Fix migration

2021-03-10 16:49:42 +01:00

intracommreport

…

langs

differentiate masks for lot management and serial numbers management

2021-03-11 10:44:55 +01:00

loan

…

mailmanspip

…

margin

…

modulebuilder

Add property widgettype

2021-03-10 17:02:39 +01:00

mrp

Fixing style errors.

2021-03-10 09:54:43 +00:00

multicurrency

…

opensurvey

…

paybox

…

paypal

…

printing

…

product

try to fix sticker

2021-03-11 14:20:50 +01:00

projet

Look and feel v14

2021-03-09 19:10:41 +01:00

public

FIX missing user get rights

2021-03-08 11:33:37 +01:00

reception

…

recruitment

…

resource

doxygen

2021-03-06 09:35:18 +01:00

salaries

Fix filter on employee

2021-03-10 17:31:33 +01:00

societe

Fix filter

2021-03-09 16:47:38 +01:00

stripe

…

supplier_proposal

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-03-03 11:37:34 +01:00

support

…

takepos

…

theme

Clean code

2021-03-10 16:41:48 +01:00

ticket

Clean code

2021-03-10 16:41:48 +01:00

user

Merge branch 'develop' into boxindex

2021-03-08 16:34:05 +01:00

variants

…

webservices

…

website

fix

2021-03-02 16:39:04 +01:00

workstation

…

zapier

…

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Complete test on setup

2021-03-10 13:12:28 +01:00

index.php

…

main.inc.php

…

master.inc.php

…

opcachepreload.php

…

robots.txt

…

security.txt

…

viewimage.php

…