Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
dolibarr-fork/htdocs
History
Laurent Destailleur cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
2022-04-11 21:22:27 +02:00
..
accountancy
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
adherents
Fix update note
2022-04-11 02:09:24 +02:00
admin
Merge pull request #20536 from atm-jpb/NEW_Add_class_name_on_expensereport_rule
2022-04-07 14:22:46 +02:00
api
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-19 17:34:26 +01:00
asset
…
asterisk
…
barcode
…
blockedlog
…
bom
Merge pull request #19459 from frederic34/productmerge
2022-04-07 15:02:03 +02:00
bookmarks
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-03 01:59:31 +01:00
categories
Rename build_path_from_id_categ into buildPathFromId and set it private
2022-04-06 13:30:56 +02:00
collab
…
comm
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
commande
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
compta
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
conf
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-01 14:40:50 +02:00
contact
css
2022-04-07 16:05:55 +02:00
contrat
Close #17632
2022-04-07 15:39:03 +02:00
core
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
cron
Debug cron to send backup by email.
2022-03-07 17:55:10 +01:00
custom
…
datapolicy
Update README.md
2022-04-05 20:21:48 +02:00
dav
…
debugbar
…
delivery
Merge pull request #19459 from frederic34/productmerge
2022-04-07 15:02:03 +02:00
don
Clean and debug online payment code
2022-04-08 15:15:55 +02:00
ecm
Look and feel v16
2022-04-11 19:21:04 +02:00
emailcollector
Doxygen
2022-04-03 12:24:03 +02:00
eventorganization
…
expedition
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 17:34:40 +02:00
expensereport
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-04 10:49:51 +02:00
exports
…
externalsite
…
fichinter
Merge pull request #19459 from frederic34/productmerge
2022-04-07 15:02:03 +02:00
fourn
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
ftp
…
holiday
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
hrm
PHP 8.0 compatibility
2022-04-08 00:14:29 +02:00
imports
Merge pull request #19677 from Hystepik/develop#1
2022-04-11 17:35:23 +02:00
includes
Upgrade ACE Editor from 1.4.7 to 1.4.14
2022-04-03 12:56:07 +02:00
install
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
intracommreport
…
knowledgemanagement
…
langs
Merge pull request #19677 from Hystepik/develop#1
2022-04-11 17:35:23 +02:00
loan
FIX #20177
2022-04-02 18:18:24 +02:00
mailmanspip/class
…
margin
…
modulebuilder
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-09 00:56:42 +02:00
mrp
Resolve merge conflicts
2022-04-08 09:54:17 +02:00
multicurrency
FIX Add protection on bad input of payment on multicurrency invoices
2022-04-08 19:52:40 +02:00
opensurvey
Fix message on best vote
2022-04-01 19:30:22 +02:00
partnership
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-24 13:23:04 +01:00
paybox
…
paypal
…
printing
…
product
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
projet
NEW Upgrade chartjs library to 3.7.1
2022-04-03 11:52:25 +02:00
public
Clean and debug online payment code
2022-04-08 15:15:55 +02:00
reception
Merge pull request #19459 from frederic34/productmerge
2022-04-07 15:02:03 +02:00
recruitment
Doxygen
2022-04-03 12:35:30 +02:00
resource
Use checkbox instead of combo to save clicks when adding a resource
2022-04-07 13:14:51 +02:00
salaries
Clean some trigger names
2022-04-02 16:08:04 +02:00
societe
Look and feel v16
2022-04-11 19:21:04 +02:00
stripe
…
supplier_proposal
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-04-08 09:25:08 +02:00
support
Fix removed the cache.manifest file (useless and pb with some browsers)
2022-03-16 19:45:39 +01:00
takepos
php8
2022-04-08 00:42:39 +02:00
theme
Look and feel v16
2022-04-11 19:21:04 +02:00
ticket
move automatic intervention creation from ticket/card.php to triggers/workflow.php
2022-04-04 09:29:03 +02:00
user
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-11 21:22:27 +02:00
variants
Standardize code of the fetch_lines()
2022-03-28 13:50:47 +02:00
webservices
…
website
css
2022-04-02 19:52:12 +02:00
workstation
…
zapier
…
.gitignore
…
document.php
…
favicon.ico
…
filefunc.inc.php
Prepare 15.0.2
2022-03-21 12:53:03 +01:00
index.php
…
main.inc.php
Fix php8 compatibility
2022-04-11 02:01:32 +02:00
master.inc.php
…
opcachepreload.php
…
robots.txt
…
security.txt
…
viewimage.php
Fix php syntax
2022-03-24 11:51:06 +01:00