ATM john
|
be367c589f
|
WIP - create validation method for common object
|
2021-06-14 21:12:48 +02:00 |
|
ATM john
|
23765bf459
|
WIP - create validation method for common object
|
2021-06-14 20:59:46 +02:00 |
|
Laurent Destailleur
|
5cc86d2319
|
Fix #yogosha6370
|
2021-06-14 13:51:09 +02:00 |
|
Laurent Destailleur
|
046215f64a
|
Fix PHP8
|
2021-06-14 02:08:28 +02:00 |
|
Laurent Destailleur
|
f8f951977c
|
Debug v14
|
2021-06-14 01:33:01 +02:00 |
|
ATM john
|
43ecba2e63
|
WIP - create validation method for common object
|
2021-06-12 14:16:40 +02:00 |
|
ATM john
|
578dc9adde
|
WIP - create validation method for common object
|
2021-06-12 12:58:20 +02:00 |
|
Laurent Destailleur
|
756786f717
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
|
2021-06-11 19:05:05 +02:00 |
|
Laurent Destailleur
|
1bf63c7862
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
|
2021-06-10 16:53:09 +02:00 |
|
Laurent Destailleur
|
24f8b6386e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/class/commonobject.class.php
|
2021-06-10 16:47:45 +02:00 |
|
Laurent Destailleur
|
8a46fd376f
|
Update commonobject.class.php
|
2021-06-10 12:58:42 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
ATM john
|
f1b1dcd1b1
|
WIP - create validation method for common object
|
2021-06-06 21:53:17 +02:00 |
|
ATM john
|
aa94d40ad0
|
WIP - create validation method for common object
|
2021-06-06 21:12:03 +02:00 |
|
ATM john
|
1aca7efce3
|
Fix childtablesoncascade doc
|
2021-06-06 13:15:03 +02:00 |
|
Laurent Destailleur
|
702de427bd
|
Merge pull request #17758 from frederic34/patch-20
fix warnings
|
2021-06-04 11:52:53 +02:00 |
|
Frédéric FRANCE
|
ca66cdad01
|
debug intracomm report transport mode
|
2021-06-03 21:47:10 +02:00 |
|
ATM john
|
a7300d01b0
|
WIP - create validation method for common object
|
2021-06-03 09:49:07 +02:00 |
|
Frédéric FRANCE
|
ca0654323f
|
fix warnings
|
2021-05-27 23:11:05 +02:00 |
|
Givriz
|
1cf7d0cee7
|
Compatibility phpv8
|
2021-05-18 20:13:26 +02:00 |
|
Laurent Destailleur
|
7a76dc4648
|
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment
new: working on conference or booth object and event type #FoundationFunding
|
2021-05-06 16:31:30 +02:00 |
|
Laurent Destailleur
|
655056ed31
|
Debug v14
|
2021-04-29 12:10:55 +02:00 |
|
Dorian Vabre
|
cb21131259
|
Merge branch 'develop' into dev_EventOrganizer_payment
|
2021-04-29 10:31:43 +02:00 |
|
Laurent Destailleur
|
062dc28850
|
Merge pull request #17388 from aspangaro/14a30
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
|
2021-04-26 21:18:48 +02:00 |
|
Laurent Destailleur
|
d138e7410b
|
Clean code
|
2021-04-26 19:12:23 +02:00 |
|
Laurent Destailleur
|
fd2d317b4a
|
Fix #yogosha5881
|
2021-04-25 15:55:36 +02:00 |
|
Laurent Destailleur
|
d0cc64479d
|
Fix protect sql
|
2021-04-24 20:18:11 +02:00 |
|
Alexandre SPANGARO
|
f60df8964a
|
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
|
2021-04-24 08:05:00 +02:00 |
|
Dorian Vabre
|
a500d83c0b
|
linked invoice and attendee
|
2021-04-20 16:09:22 +02:00 |
|
Alexandre SPANGARO
|
f64d0377c5
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-04-04 06:03:41 +02:00 |
|
Laurent Destailleur
|
3744bc6a7a
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 18:17:13 +02:00 |
|
Laurent Destailleur
|
fae3cca494
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 17:45:15 +02:00 |
|
Laurent Destailleur
|
6e422d26f3
|
FIX #yogosha5746 - next step (wip)
|
2021-03-30 16:20:18 +02:00 |
|
Laurent Destailleur
|
6c98276ead
|
FIX #yogosha5782
|
2021-03-30 11:26:49 +02:00 |
|
Laurent Destailleur
|
fb84608586
|
Clean sql
|
2021-03-30 03:37:54 +02:00 |
|
Laurent Destailleur
|
3616d2ba44
|
FIX #yogosha5770
|
2021-03-29 23:24:52 +02:00 |
|
Laurent Destailleur
|
a4987c6e4f
|
Merge branch 'develop' into 14a22
|
2021-03-29 20:35:35 +02:00 |
|
Laurent Destailleur
|
3a4bb69c05
|
FIX #yogosha5749
|
2021-03-29 15:32:09 +02:00 |
|
Laurent Destailleur
|
ce1f8289a4
|
FIX #yogosha5746
|
2021-03-29 15:07:23 +02:00 |
|
Alexandre SPANGARO
|
2a1cc04b66
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-28 06:16:33 +02:00 |
|
Laurent Destailleur
|
eeba9e4d50
|
Code comment
|
2021-03-24 21:58:06 +01:00 |
|
Laurent Destailleur
|
21a9779fe2
|
FIX inconsistency in margin recording with option "Force to sale price"
|
2021-03-24 21:49:45 +01:00 |
|
Laurent Destailleur
|
a5034d44f7
|
$_POST war
|
2021-03-24 19:53:31 +01:00 |
|
Laurent Destailleur
|
00e48aa922
|
Clean and secured code for ajax/row.php
|
2021-03-23 16:09:02 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
Laurent Destailleur
|
e334e83a64
|
Merge branch 'develop' into 14a22
|
2021-03-20 13:42:54 +01:00 |
|
Frédéric FRANCE
|
8142d76394
|
fix php8 warnings
|
2021-03-20 10:50:02 +01:00 |
|
Frédéric FRANCE
|
fced63e93b
|
fix php8 warning
|
2021-03-17 20:11:22 +01:00 |
|
Frédéric FRANCE
|
4e8ea5c07e
|
fix php8 warnings
|
2021-03-16 21:13:15 +01:00 |
|
Laurent Destailleur
|
87ab711a0f
|
Merge pull request #16707 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-16 10:34:55 +01:00 |
|
Laurent Destailleur
|
897f4be033
|
Merge pull request #16712 from frederic34/patch-9
fix php8 warnings
|
2021-03-16 10:33:01 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +01:00 |
|
Frédéric FRANCE
|
f7d43ce4fb
|
fix php8 warnings
|
2021-03-15 20:55:59 +01:00 |
|
Frédéric FRANCE
|
a0e6f454ff
|
fix php8 warnings
|
2021-03-15 20:31:55 +01:00 |
|
Florian HENRY
|
177a6bfe4f
|
conference or booth card and list ok
|
2021-03-15 20:20:53 +01:00 |
|
Laurent Destailleur
|
a8c34a5b05
|
Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
MAIN_EXTRAFIELDS_DISABLE_SELECT2
|
2021-03-15 14:16:55 +01:00 |
|
Laurent Destailleur
|
7d1e18f5ab
|
Merge pull request #16625 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-15 11:37:57 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Florian HENRY
|
862926316a
|
working on list
|
2021-03-11 19:09:42 +01:00 |
|
Laurent Destailleur
|
b1f4c29fde
|
Fix missing alias
|
2021-03-09 20:12:14 +01:00 |
|
Laurent Destailleur
|
3cb072f67a
|
Update commonobject.class.php
|
2021-03-09 15:13:20 +01:00 |
|
Florian HENRY
|
ce5324c08c
|
Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList
|
2021-03-09 10:24:07 +01:00 |
|
Florian HENRY
|
bcbf8bb72a
|
allow table alias into commonObject getFieldList
|
2021-03-09 10:21:32 +01:00 |
|
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
|
7d20df8054
|
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
|
2021-03-04 16:53:54 +01:00 |
|
Laurent Destailleur
|
ffa0e6c391
|
FIX Timezone management for datetime on list of events
|
2021-03-04 15:34:29 +01:00 |
|
Laurent Destailleur
|
33c4180781
|
FIX Timezone management for datetime with modulebuilder
|
2021-03-04 09:36:19 +01:00 |
|
Frédéric FRANCE
|
2d9f00eb57
|
Update commonobject.class.php
|
2021-03-03 12:24:44 +01:00 |
|
lvessiller
|
66ad8fbb24
|
FIX select list dependancies on common object (FIX #16510)
|
2021-03-02 17:21:55 +01:00 |
|
Laurent Destailleur
|
42329b10c9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
|
2021-03-02 15:27:20 +01:00 |
|
Florian HENRY
|
2c163b8163
|
fix #16510
|
2021-03-02 15:22:22 +01:00 |
|
Laurent Destailleur
|
1f25f2bb7e
|
Fix phpcs
|
2021-03-02 15:09:29 +01:00 |
|
Laurent Destailleur
|
3982a36a3e
|
Update commonobject.class.php
|
2021-03-02 14:47:35 +01:00 |
|
Florian HENRY
|
27c354567a
|
FIX : select list dependencies now work for ModuleBuilder sellist field
|
2021-03-02 14:06:11 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Gauthier PC portable 024
|
6da28f5e44
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-03-01 11:12:03 +01:00 |
|
Alexandre SPANGARO
|
7a3dfda8ee
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 21:30:25 +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
|
2a3b3753a8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-02-28 13:27:38 +01:00 |
|
Alexandre SPANGARO
|
ca7958f273
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 07:32:23 +01:00 |
|
Laurent Destailleur
|
753b1d1e11
|
FIX status on tooltip on widgets
|
2021-02-27 19:43:56 +01:00 |
|
Laurent Destailleur
|
5c0ea476e1
|
Look and feel v14
|
2021-02-27 12:45:07 +01:00 |
|
Frédéric FRANCE
|
8bfa7565bd
|
Update commonobject.class.php
|
2021-02-27 08:52:40 +01:00 |
|
Frédéric FRANCE
|
2cc635fd09
|
FIX https://github.com/Dolibarr/dolibarr/issues/16465
|
2021-02-27 08:00:02 +01:00 |
|
Gauthier PC portable 024
|
c996871f98
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-26 11:50:18 +01:00 |
|
Frédéric FRANCE
|
554e449e40
|
code syntax core directory
|
2021-02-23 22:03:23 +01:00 |
|
Gauthier PC portable 024
|
c0160a5f3b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-23 15:20:15 +01:00 |
|
Laurent Destailleur
|
f6080d45fa
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-22 16:21:26 +01:00 |
|
Laurent Destailleur
|
912f9f9bdb
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/contact/card.php
htdocs/core/actions_massactions.inc.php
|
2021-02-22 15:54:24 +01:00 |
|
Laurent Destailleur
|
c010cab47e
|
Fix translation of default value for contacts
|
2021-02-22 15:51:00 +01:00 |
|
Alexandre SPANGARO
|
7f4040e464
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 11:59:13 +01:00 |
|
Alexandre SPANGARO
|
22c936ba19
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 11:28:36 +01:00 |
|
Laurent Destailleur
|
f99232e66e
|
Merge branch 'develop' into 14a21
|
2021-02-22 11:18:07 +01:00 |
|
Gauthier PC portable 024
|
939d406ab1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-22 09:10:24 +01:00 |
|
Alexandre SPANGARO
|
ae4fc565e1
|
Widget & commonobject
|
2021-02-22 05:38:31 +01:00 |
|
Alexandre SPANGARO
|
71ce871da6
|
Fix element
|
2021-02-22 05:13:14 +01:00 |
|
Alexandre SPANGARO
|
818a826c3e
|
Code enhanced - Standardize field name
|
2021-02-21 22:10:00 +01:00 |
|
Alexandre SPANGARO
|
2cd181b86d
|
Code enhanced - Standardize field name #14697
|
2021-02-21 22:07:58 +01:00 |
|
Laurent Destailleur
|
e3419df36e
|
Merge branch 'develop' into 14a20
|
2021-02-21 20:28:06 +01:00 |
|
Laurent Destailleur
|
4b632fb24f
|
Merge branch 'develop' into 14a19
|
2021-02-20 17:08:23 +01:00 |
|
Laurent Destailleur
|
7c25f06f58
|
Merge pull request #16353 from aspangaro/14a18
Code enhanced - Standardize field name #14697
|
2021-02-20 16:51:34 +01:00 |
|
Alexandre SPANGARO
|
3dcfe40e71
|
Code enhanced - Standardize field name #14697
|
2021-02-20 08:00:27 +01:00 |
|
Alexandre SPANGARO
|
1017d480f9
|
Code enhanced - Standardize field name #14697
|
2021-02-20 07:08:37 +01:00 |
|
Alexandre SPANGARO
|
708a9fb453
|
Code enhanced - Standardize field name
|
2021-02-19 21:57:54 +01:00 |
|
Alexandre SPANGARO
|
f462455e89
|
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
|
2021-02-18 21:39:25 +01:00 |
|
Gauthier PC portable 024
|
134d7e00ec
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-17 16:56:50 +01:00 |
|
Florian HENRY
|
d7dfb9138a
|
working on setup
|
2021-02-14 15:00:20 +01:00 |
|
Anthony Berton
|
d10e46adca
|
Update commonobject.class.php
|
2021-02-11 17:46:28 +01:00 |
|
Anthony Berton
|
55f8d64202
|
Update commonobject.class.php
|
2021-02-11 12:16:07 +01:00 |
|
Laurent Destailleur
|
21558dd0a6
|
Debug and enhance the feature to assign tasks on project assignation
|
2021-02-09 17:52:33 +01:00 |
|
Gauthier PC portable 024
|
d106fe7e90
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-09 09:50:46 +01:00 |
|
Frédéric FRANCE
|
898bf55202
|
Merge remote-tracking branch 'upstream/develop' into facturerec
|
2021-02-08 20:21:46 +01:00 |
|
Frédéric FRANCE
|
815f3602e3
|
clean deprecated modelpdf to model_pdf
|
2021-02-08 18:30:09 +01:00 |
|
Laurent Destailleur
|
c0aa7e7db5
|
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
|
2021-02-08 17:19:40 +01:00 |
|
Florian HENRY
|
1e8117dc8a
|
fix js
|
2021-02-08 11:49:30 +01:00 |
|
Gauthier PC portable 024
|
41af1a59f4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-08 10:37:01 +01:00 |
|
Gauthier PC portable 024
|
e2a73e6c88
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-08 09:46:48 +01:00 |
|
Philippe GRAND
|
b2e61aa499
|
fix typo
|
2021-02-05 18:23:17 +01:00 |
|
Gauthier PC portable 024
|
df8ca1ef84
|
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-05 09:29:20 +01:00 |
|
Gauthier PC portable 024
|
e188ec6cd7
|
NEW : add real payments on salaries objects
|
2021-02-04 17:21:08 +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
|
bd9eb4c949
|
FIX Assignement of actors on tasks
|
2021-02-02 15:36:54 +01:00 |
|
Laurent Destailleur
|
fed99aa3bb
|
FIX Assignement of actors on tasks
|
2021-02-02 15:35:40 +01:00 |
|
Laurent Destailleur
|
e6deed1601
|
Fix collapse
|
2021-02-01 15:40:59 +01:00 |
|
Gauthier PC portable 024
|
1eb4968a29
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-01 12:00:04 +01:00 |
|
Laurent Destailleur
|
641885d814
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-31 19:05:27 +01:00 |
|
Laurent Destailleur
|
3801dd34cd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-01-31 19:02:57 +01:00 |
|
Laurent Destailleur
|
d023afb66f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-01-31 18:55:11 +01:00 |
|
Gauthier PC portable 024
|
8a5588e518
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-28 10:28:36 +01:00 |
|
Florian Mortgat
|
8dfe39258b
|
FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion
|
2021-01-27 23:46:09 +01:00 |
|
Adrien Raze
|
6ab63a10d6
|
FIX : Linked extrafields don't work with string value
|
2021-01-26 09:37:28 +01:00 |
|
Laurent Destailleur
|
0861c639ae
|
Fix sql injection
|
2021-01-25 12:40:52 +01:00 |
|
Laurent Destailleur
|
470cd5c682
|
Clean code
|
2021-01-25 12:39:44 +01:00 |
|
Laurent Destailleur
|
0f5fc7353e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/admin/mailing.php
htdocs/admin/paymentbybanktransfer.php
htdocs/admin/prelevement.php
htdocs/modulebuilder/template/admin/setup.php
|
2021-01-24 15:29:53 +01:00 |
|
Laurent Destailleur
|
c5bbaffb50
|
Fix look and feel v13
|
2021-01-23 19:50:04 +01:00 |
|
Laurent Destailleur
|
af438624a6
|
Update commonobject.class.php
|
2021-01-21 13:21:22 +01:00 |
|
Laurent Destailleur
|
0a55ba32f8
|
Merge branch 'develop' into FIX/Linked_extrafields_10.0
|
2021-01-21 13:20:34 +01:00 |
|
Adrien Raze
|
645685d16e
|
FIX : Linked extrafields list
|
2021-01-20 18:39:18 +01:00 |
|
Gauthier PC portable 024
|
e2abbbcece
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 08:57:24 +01:00 |
|
David Bensel
|
9813cb430a
|
FIX: type 'sellist' not handled properly in showInputField and showOutputField
|
2021-01-18 19:14:12 +01:00 |
|
Gauthier PC portable 024
|
2cfaf5fbd6
|
NEW : add real payments on vat objects
|
2021-01-18 17:08:17 +01:00 |
|
David Bensel
|
85d63891d9
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2021-01-18 17:33:22 +03:00 |
|
David Bensel
|
b777a0660c
|
FIX: type 'sellist' not handled properly in showInputField and showOutputField
|
2021-01-18 17:31:49 +03:00 |
|
Frédéric FRANCE
|
923a5fe2a5
|
Merge remote-tracking branch 'upstream/develop' into davadmin
|
2021-01-13 18:45:29 +01:00 |
|
Laurent Destailleur
|
0af5c9ae91
|
Fix phpcs
|
2021-01-13 17:45:17 +01:00 |
|
Frédéric FRANCE
|
40a45efb63
|
fix code
|
2021-01-13 16:23:54 +01:00 |
|
Frédéric FRANCE
|
cb7266d261
|
fix trans
|
2021-01-13 16:18:23 +01:00 |
|
Laurent Destailleur
|
c2187b2ff1
|
Merge branch 'develop' into develop_new_workstation
|
2021-01-11 17:59:13 +01:00 |
|
Laurent Destailleur
|
9962c182c4
|
Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
|
2021-01-11 16:15:45 +01:00 |
|
Gauthier PC portable 024
|
6668cfa311
|
FIX : name in copyrights
|
2021-01-11 11:40:04 +01:00 |
|
Gauthier PC portable 024
|
e3e4f0590c
|
FIX : get and delete linked items with association tables methods created in common object
|
2021-01-11 11:36:19 +01:00 |
|
Laurent Destailleur
|
3d2dc59468
|
Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment
NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
|
2021-01-07 10:49:06 +01:00 |
|
Regis Houssin
|
f80a476bc5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
|
2021-01-06 11:37:56 +01:00 |
|
kamel
|
32109de67b
|
NEW : Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
|
2021-01-06 11:14:13 +01:00 |
|
Florian HENRY
|
f953ff0334
|
fix sticker
|
2021-01-05 15:25:47 +01:00 |
|
Florian HENRY
|
a2a45c6aa0
|
fix sticker
|
2021-01-05 15:22:31 +01:00 |
|
Florian HENRY
|
27c32560c6
|
Merge develop
|
2021-01-05 14:46:50 +01:00 |
|
Laurent Destailleur
|
ed25b252b9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-05 11:30:14 +01:00 |
|
Florian HENRY
|
86075a4db9
|
review code
|
2021-01-04 20:00:57 +01:00 |
|
Laurent Destailleur
|
c58451dbb6
|
Code comment
|
2021-01-04 16:07:54 +01:00 |
|
Regis Houssin
|
e36ae4ac90
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
|
2021-01-02 13:14:30 +01:00 |
|
Regis Houssin
|
aec01a95fc
|
FIX again and again
|
2020-12-29 17:48:52 +01:00 |
|
Florian HENRY
|
1e438b686e
|
fix stickler
|
2020-12-28 21:32:46 +01:00 |
|
Florian HENRY
|
806b40662f
|
merge develop
|
2020-12-28 21:15:25 +01:00 |
|
Laurent Destailleur
|
1546805b9e
|
Merge pull request #15500 from frederic34/patch-10
NEW add db fields note_public note_private for ecm
|
2020-12-27 15:07:51 +01:00 |
|
Florian HENRY
|
720539ff46
|
on goung
|
2020-12-23 23:52:43 +01:00 |
|
Florian HENRY
|
26d3ea2227
|
on going
|
2020-12-23 23:32:50 +01:00 |
|
Laurent Destailleur
|
4471d7d1da
|
FIX debug report expense/income
|
2020-12-23 22:18:38 +01:00 |
|
Laurent Destailleur
|
940f0484ee
|
FIX debug report expense/income
|
2020-12-23 22:17:05 +01:00 |
|
Laurent Destailleur
|
7fae5ea800
|
Code clean
|
2020-12-20 18:21:34 +01:00 |
|
Laurent Destailleur
|
a67068ab7b
|
Fix warnings
|
2020-12-17 18:08:56 +01:00 |
|
Laurent Destailleur
|
b0d524beed
|
Debug v13
|
2020-12-17 11:57:12 +01:00 |
|
David Bensel
|
bc9f7c83f4
|
update
|
2020-12-14 22:40:47 +03:00 |
|
Laurent Destailleur
|
3d33d3aa3a
|
Fix warning
|
2020-12-13 14:36:00 +01:00 |
|
Frédéric FRANCE
|
346fe8ae85
|
clean
|
2020-12-12 22:35:51 +01:00 |
|
Frédéric FRANCE
|
4664ac1a1c
|
socialnetworks links
|
2020-12-12 17:00:23 +01:00 |
|
Laurent Destailleur
|
2adbd29b49
|
Debug generation of doc from modulebuilder
|
2020-12-11 14:22:36 +01:00 |
|
Laurent Destailleur
|
1f28590e5e
|
Fix style
|
2020-12-10 19:05:54 +01:00 |
|
Laurent Destailleur
|
6e403e6ce0
|
Fix warnings
|
2020-12-07 18:29:14 +01:00 |
|
Frédéric FRANCE
|
a2eab824c1
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-12-04 20:42:22 +01:00 |
|
Laurent Destailleur
|
d88173d7ba
|
Fix bad column
|
2020-12-02 19:13:32 +01:00 |
|
Laurent Destailleur
|
9e18997e64
|
FIX #15595
|
2020-12-02 16:35:43 +01:00 |
|
Laurent Destailleur
|
49be354c3e
|
Fix warning
|
2020-12-02 14:05:17 +01:00 |
|
Scrutinizer Auto-Fixer
|
6df4954b20
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-12-01 01:41:19 +00:00 |
|
Laurent Destailleur
|
2707c0b89b
|
Look and feel v13
|
2020-11-30 20:13:42 +01:00 |
|
Laurent Destailleur
|
958893228a
|
Fix combo to add contact and status of contact on popup
|
2020-11-30 15:18:58 +01:00 |
|
Frédéric FRANCE
|
1704de39bb
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-11-27 11:18:04 +01:00 |
|
Laurent Destailleur
|
47a5037155
|
Fix dolGetFirstLastname() for 4 and 5
|
2020-11-27 01:18:01 +01:00 |
|
Laurent Destailleur
|
3588781180
|
Debug v13
|
2020-11-26 14:15:20 +01:00 |
|
Laurent Destailleur
|
e272130a6a
|
Fix phpcs
|
2020-11-26 08:40:08 +01:00 |
|
Laurent Destailleur
|
74605cec12
|
Fix warning
|
2020-11-25 18:07:52 +01:00 |
|
Laurent Destailleur
|
4d90fb22de
|
Fix sql syntax error
|
2020-11-25 15:07:26 +01:00 |
|
Laurent Destailleur
|
5030f0c587
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/opensurvey/wizard/create_survey.php
|
2020-11-25 14:55:31 +01:00 |
|
Laurent Destailleur
|
bf7b6ee00d
|
Fix delete of proposal
|
2020-11-25 14:15:59 +01:00 |
|
Frédéric FRANCE
|
66ad0e5b13
|
add note on ecm files
|
2020-11-24 18:54:59 +01:00 |
|
Laurent Destailleur
|
efc539c4b4
|
Fix css
|
2020-11-23 19:53:58 +01:00 |
|
Laurent Destailleur
|
2f6f242d99
|
CSS
|
2020-11-23 12:29:38 +01:00 |
|