Laurent Destailleur
|
07ce3fc34d
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2020-04-18 11:08:21 +02:00 |
|
Laurent Destailleur
|
23876684cb
|
Responsive
|
2020-04-18 11:06:28 +02:00 |
|
Laurent Destailleur
|
5254a94038
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
|
2020-04-16 15:58:59 +02:00 |
|
atm-quentin
|
f7c07640dd
|
viewstatut to search_status
|
2020-04-15 15:01:00 +02:00 |
|
Scrutinizer Auto-Fixer
|
387ea73bf3
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-13 11:24:42 +00:00 |
|
Laurent Destailleur
|
96d087c99d
|
Fix clean event report
|
2020-04-13 02:59:33 +02:00 |
|
Laurent Destailleur
|
596ba8d679
|
Clean deprecated code.
|
2020-04-13 01:10:35 +02:00 |
|
Laurent Destailleur
|
92b6b1a042
|
Look and feel v12
|
2020-04-12 18:13:43 +02:00 |
|
stickler-ci
|
a873afdad9
|
Fixing style errors.
|
2020-04-12 15:08:44 +00:00 |
|
Laurent Destailleur
|
51f73526f9
|
Merge branch 'develop' into patch-8
|
2020-04-12 17:07:57 +02:00 |
|
Laurent Destailleur
|
fe4cd2e7bc
|
Update actioncomm.class.php
|
2020-04-12 17:05:12 +02:00 |
|
Laurent Destailleur
|
422e33a68b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
|
2020-04-12 17:01:44 +02:00 |
|
Laurent Destailleur
|
1cda760621
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
|
2020-04-12 16:54:09 +02:00 |
|
Laurent Destailleur
|
eebf48b27c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
|
2020-04-12 16:52:58 +02:00 |
|
Frédéric FRANCE
|
e2660fd31c
|
Update actioncomm.class.php
|
2020-04-11 22:38:28 +02:00 |
|
Frédéric FRANCE
|
88f18ec3ce
|
can't remove actioncomm if there is a category
|
2020-04-11 22:24:50 +02:00 |
|
Laurent Destailleur
|
0845f0bcd3
|
Merge pull request #13523 from bb2a/patch-2
add in default search
|
2020-04-10 12:12:28 +02:00 |
|
Laurent Destailleur
|
5ff981bf61
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/user/perms.php
|
2020-04-10 12:04:21 +02:00 |
|
Laurent Destailleur
|
874cbcefc7
|
Fix permission to close a proposal or order was not correctly used
#13547
|
2020-04-10 11:54:14 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Anthony Berton
|
a7440687ec
|
Update list.php
|
2020-04-10 10:38:31 +02:00 |
|
Laurent Destailleur
|
4ff503d20a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
|
2020-04-10 02:07:51 +02:00 |
|
Laurent Destailleur
|
7fe8c7eab3
|
FIX #11855
|
2020-04-10 01:37:04 +02:00 |
|
Laurent Destailleur
|
83af4ebea4
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/list.php
|
2020-04-10 01:22:22 +02:00 |
|
Laurent Destailleur
|
63f0c07a07
|
Add warning
|
2020-04-08 18:32:13 +02:00 |
|
Laurent Destailleur
|
1adee36314
|
Upgrade to font awesome 5.13
|
2020-04-07 21:11:18 +02:00 |
|
Laurent Destailleur
|
ff1b3db54b
|
Fix regression on hamburger picto
|
2020-04-06 23:38:30 +02:00 |
|
Laurent Destailleur
|
28a1b7af35
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-04-03 18:07:24 +02:00 |
|
Laurent Destailleur
|
193a10bc39
|
FIX cloning of emailing when no content selected
|
2020-04-03 02:29:10 +02:00 |
|
Laurent Destailleur
|
84cda962c1
|
Clean dead code
|
2020-04-02 12:03:29 +02:00 |
|
Laurent Destailleur
|
4207d94f53
|
FIX Bad position of total in column
Conflicts:
htdocs/fourn/facture/paiement.php
|
2020-03-27 19:10:01 +01:00 |
|
Laurent Destailleur
|
a4797634d5
|
FIX Bad position of total in column
|
2020-03-27 19:08:39 +01:00 |
|
Laurent Destailleur
|
c27592bad2
|
Clean deprecated params on all fetch_optionals()
|
2020-03-27 16:02:58 +01:00 |
|
Laurent Destailleur
|
004397304e
|
FIX Foreign currency lost when splitting a discount
|
2020-03-26 02:32:53 +01:00 |
|
Laurent Destailleur
|
f0de10897a
|
FIX Foreign currency lost when splitting a discount
|
2020-03-26 02:32:24 +01:00 |
|
Laurent Destailleur
|
fa3bba942f
|
Start to save the VAT src code into table of discounts to reuse them
later
|
2020-03-26 02:01:30 +01:00 |
|
Laurent Destailleur
|
62fefab5ac
|
Standardize color of status
|
2020-03-24 19:06:37 +01:00 |
|
Laurent Destailleur
|
a5379c7144
|
FIX All forms must use newToken()
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
|
2020-03-24 13:14:23 +01:00 |
|
Laurent Destailleur
|
1ff15e1fd9
|
FIX All forms must use newToken()
|
2020-03-24 13:10:35 +01:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
01e60562b9
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
|
2020-03-23 15:38:10 +01:00 |
|
Laurent Destailleur
|
599bf89f60
|
Fix can edit emailing after sending has started
|
2020-03-20 20:46:21 +01:00 |
|
Laurent Destailleur
|
5d9e713a1c
|
Fix better default sort order
|
2020-03-20 20:36:59 +01:00 |
|
Laurent Destailleur
|
68cadb58bb
|
Fix better default sort order
|
2020-03-20 20:36:26 +01:00 |
|
Laurent Destailleur
|
8bab245c7e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
|
2020-03-18 18:50:55 +01:00 |
|
Laurent Destailleur
|
8192e9dc67
|
FIX Missing token in form
|
2020-03-14 03:02:49 +01:00 |
|
Laurent Destailleur
|
6e71bb8707
|
Look and feel v12: Use color of status for dotnuts
|
2020-03-14 02:17:08 +01:00 |
|
Laurent Destailleur
|
3b72005f93
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
|
2020-03-14 00:22:11 +01:00 |
|
florian HENRY
|
ca269864f7
|
let keep it to expedition
|
2020-03-13 14:55:34 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|