Laurent Destailleur
|
a3fb8d3e14
|
Factorize code
|
2021-04-05 19:34:56 +02:00 |
|
Alexandre SPANGARO
|
f64d0377c5
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-04-04 06:03:41 +02:00 |
|
Laurent Destailleur
|
e01b6b6789
|
FIX filter on date on invoice list
|
2021-03-31 18:39:59 +02:00 |
|
Laurent Destailleur
|
fb7cfe6c50
|
Fix sql error
|
2021-03-30 19:15:20 +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
|
fb84608586
|
Clean sql
|
2021-03-30 03:37:54 +02:00 |
|
Laurent Destailleur
|
b702d2b534
|
Fix CSRF for more GET
|
2021-03-29 22:58:44 +02:00 |
|
Laurent Destailleur
|
0740633ec8
|
Update facture-rec.class.php
|
2021-03-29 20:42:59 +02:00 |
|
Laurent Destailleur
|
a4987c6e4f
|
Merge branch 'develop' into 14a22
|
2021-03-29 20:35:35 +02:00 |
|
Laurent Destailleur
|
5c2ee240b2
|
FIX #yogosha5752
|
2021-03-29 15:59:37 +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 |
|
Laurent Destailleur
|
b929641fe1
|
Look and feel v14
|
2021-03-29 13:00:17 +02:00 |
|
Laurent Destailleur
|
a5d84200dc
|
Clean code for invoice list
|
2021-03-28 19:22:04 +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
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +01:00 |
|
Laurent Destailleur
|
6a0e0f4c06
|
Fix #ygosha5698
|
2021-03-22 12:10:51 +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 |
|
Laurent Destailleur
|
d8aa5f5eab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-20 12:43:07 +01:00 |
|
Laurent Destailleur
|
3d3a7bfd37
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2021-03-20 12:42:46 +01:00 |
|
Laurent Destailleur
|
7f6044c52e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
|
2021-03-20 12:18:40 +01:00 |
|
Laurent Destailleur
|
827a952dca
|
Merge pull request #16839 from dolibit-ut/patch-130
Update card.php
|
2021-03-20 11:49:18 +01:00 |
|
Laurent Destailleur
|
3edeb8b4aa
|
Merge pull request #16840 from dolibit-ut/patch-131
Update document.php
|
2021-03-20 11:49:06 +01:00 |
|
Frédéric FRANCE
|
bae1770176
|
uniformise comments to remove nested comments
|
2021-03-20 10:00:24 +01:00 |
|
Frédéric FRANCE
|
2de2f1ce4d
|
fix nested comments for doxygen
|
2021-03-20 09:02:29 +01:00 |
|
Laurent Destailleur
|
d83d005284
|
FIX #yogosha5674
|
2021-03-19 12:44:59 +01:00 |
|
UT from dolibit
|
46c23807e9
|
Update document.php
$helpurl -> $help_url
|
2021-03-19 09:38:33 +01:00 |
|
UT from dolibit
|
b4e929e57f
|
Update card.php
$helpurl -> $help_url
|
2021-03-19 09:36:49 +01:00 |
|
Laurent Destailleur
|
3522af926a
|
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
invoice list - add new standard hooks
|
2021-03-18 22:58:18 +01:00 |
|
Laurent Destailleur
|
43494df56c
|
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
add invoice getNomUrl hook
|
2021-03-18 22:57:37 +01:00 |
|
Laurent Destailleur
|
461d748f97
|
Fix #yogosha235
|
2021-03-18 20:27:36 +01:00 |
|
Alexis LAURIER
|
5b72193f0d
|
invoice list - ajust hooks
|
2021-03-18 17:06:49 +01:00 |
|
Alexis LAURIER
|
ada5d728b5
|
invoice list - ajust hooks
|
2021-03-18 17:00:57 +01:00 |
|
Alexis LAURIER
|
06bc999614
|
Add group by and having hooks on invoice list
|
2021-03-18 16:51:02 +01:00 |
|
Alexis LAURIER
|
c3f8e0e397
|
invoice list - add new standard hook
|
2021-03-18 16:21:54 +01:00 |
|
Alexis LAURIER
|
b416223194
|
fix
|
2021-03-18 11:16:49 +01:00 |
|
Alexis LAURIER
|
c33347b461
|
add invoice getNomUrl hook
|
2021-03-18 11:10:43 +01:00 |
|
Laurent Destailleur
|
73e55f1b73
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-17 18:44:47 +01:00 |
|
Laurent Destailleur
|
0da5c89973
|
Look and feel v14
|
2021-03-17 18:24:37 +01:00 |
|
Frédéric FRANCE
|
519b08b782
|
fix php8 warnings
|
2021-03-16 18:25:25 +01:00 |
|
Laurent Destailleur
|
e00e6cfd9a
|
Merge pull request #16721 from aspangaro/14a25
Translation "Generated documents"
|
2021-03-16 10:25:31 +01:00 |
|
Alexandre SPANGARO
|
03481a0197
|
Uniformize translation
|
2021-03-16 04:22:43 +01:00 |
|
Alexandre SPANGARO
|
4fd24c6855
|
Translation "Generated documents"
|
2021-03-16 04:04:18 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +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 |
|
Laurent Destailleur
|
ab89d85095
|
Fix for php8
|
2021-03-08 11:33:07 +01:00 |
|
Laurent Destailleur
|
4d409e23f5
|
Missing declaration of properties
|
2021-03-08 09:16:33 +01:00 |
|
Laurent Destailleur
|
a1d97274fb
|
Clean code for php8
|
2021-03-08 09:14:23 +01:00 |
|
Laurent Destailleur
|
1affaa8c87
|
fix phpunit
|
2021-03-07 20:26:36 +01:00 |
|
Laurent Destailleur
|
1ca3e433d2
|
Fix phpunit
|
2021-03-07 19:55:09 +01:00 |
|
Laurent Destailleur
|
0f7085154b
|
Fix phpunit
|
2021-03-07 19:47:55 +01:00 |
|
Laurent Destailleur
|
91245e22d4
|
Fix phpunit phpv8
|
2021-03-07 19:16:09 +01:00 |
|
Laurent Destailleur
|
63aa2f4ec2
|
Fix phpunit
|
2021-03-06 12:50:38 +01:00 |
|
Laurent Destailleur
|
7959bc99d7
|
Fix phpcs
|
2021-03-06 10:39:51 +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
|
31845e1dae
|
Fix phpcs
|
2021-03-04 00:04:43 +01:00 |
|
Laurent Destailleur
|
6503c81f47
|
FIX #16530
|
2021-03-03 23:55:28 +01:00 |
|
Laurent Destailleur
|
30dd4ac6ec
|
FIX #16530
|
2021-03-03 22:52:02 +01:00 |
|
Laurent Destailleur
|
f11a85a3e3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
|
2021-03-03 11:37:34 +01:00 |
|
Laurent Destailleur
|
7eb3e324c7
|
FIX #16503
|
2021-03-02 23:09: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 |
|
stickler-ci
|
35cb48d649
|
Fixing style errors.
|
2021-03-02 11:37:46 +00:00 |
|
Laurent Destailleur
|
1d642f49f7
|
Update facture.class.php
|
2021-03-02 12:37:24 +01:00 |
|
Florian HENRY
|
d063533efb
|
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
|
2021-03-02 09:46:05 +01:00 |
|
Florian HENRY
|
d7500b1609
|
fix php warning
|
2021-03-02 09:45:49 +01:00 |
|
Laurent Destailleur
|
cffea1889f
|
FIX #16325
|
2021-03-02 01:17:28 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Alexandre SPANGARO
|
94a861c1c8
|
Code enhanced - Standardize field name
|
2021-03-01 04:07:31 +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
|
2ce76133f4
|
FIX #16487
|
2021-02-28 12:59:58 +01:00 |
|
Alexandre SPANGARO
|
ca7958f273
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 07:32:23 +01:00 |
|
Laurent Destailleur
|
ccffa7e2a0
|
Merge pull request #16412 from frederic34/compta_codesyntax
code syntax compta directory
|
2021-02-26 10:21:22 +01:00 |
|
Laurent Destailleur
|
d4a78bf7c6
|
Removed useless field
|
2021-02-24 10:24:54 +01:00 |
|
Frédéric FRANCE
|
61600a9e65
|
code syntax compta directory
|
2021-02-23 21:09:01 +01:00 |
|
Laurent Destailleur
|
2642e1d1b3
|
Code syntax
|
2021-02-23 15:35:16 +01:00 |
|
Laurent Destailleur
|
888c072af0
|
NEW Can set a percentage when creating an invoice from another object
|
2021-02-23 14:48:54 +01:00 |
|
Laurent Destailleur
|
8c1902be1b
|
Missing space
|
2021-02-22 18:40:15 +01:00 |
|
Alexandre SPANGARO
|
d04b04c10f
|
Fix
|
2021-02-22 06:22:47 +01:00 |
|
Alexandre SPANGARO
|
70dddd9bdf
|
Index & module
|
2021-02-22 05:58:46 +01:00 |
|
Laurent Destailleur
|
1bb27f8f18
|
Responsive
|
2021-02-21 13:12:16 +01:00 |
|
Laurent Destailleur
|
71f537e4c1
|
Responsive
|
2021-02-19 22:12:03 +01:00 |
|
Laurent Destailleur
|
2be6992916
|
Fix include_once into include for inc.php file. See comment in #16338
|
2021-02-19 16:10:19 +01:00 |
|
Laurent Destailleur
|
bfe71e8509
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-17 14:28:19 +01:00 |
|
Laurent Destailleur
|
96a213ced7
|
Fix escaping html
|
2021-02-17 11:54:34 +01:00 |
|
Laurent Destailleur
|
dabf9d796a
|
FIX Rename title of template invoice
|
2021-02-15 22:16:01 +01:00 |
|
Laurent Destailleur
|
44b3221aaf
|
FIX Rename title of template invoice
|
2021-02-15 22:15:14 +01:00 |
|
Laurent Destailleur
|
be3703a05b
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2021-02-15 16:46:55 +01:00 |
|
Laurent Destailleur
|
f0e234c874
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/bank/various_payment/list.php
|
2021-02-15 16:45:17 +01:00 |
|
Laurent Destailleur
|
6132843586
|
FIX Filter on date of next generation on template invoices
|
2021-02-15 16:43:24 +01:00 |
|
Laurent Destailleur
|
1b129831a9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-09 14:09:46 +01:00 |
|
Laurent Destailleur
|
48a4ed656b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2021-02-09 14:08:49 +01:00 |
|
Laurent Destailleur
|
89bda722bf
|
Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
|
2021-02-09 13:29:40 +01:00 |
|
Frédéric FRANCE
|
e2d2048522
|
deprecate non camelCaps functions
|
2021-02-09 13:25:55 +01:00 |
|
Frédéric FRANCE
|
04c25a01af
|
deprecate non camelCaps functions
|
2021-02-09 13:10:11 +01:00 |
|
Frédéric FRANCE
|
f394e55ade
|
deprecate non camelCaps functions
|
2021-02-09 10:26:17 +01:00 |
|
Frédéric FRANCE
|
fe9ee5a398
|
deprecate non camelCaps functions
|
2021-02-09 09:49:37 +01:00 |
|
Frédéric FRANCE
|
6d961a1f79
|
deprecate non camelCaps functions
|
2021-02-09 09:40:07 +01:00 |
|
Florian HENRY
|
dbbebba497
|
this->errors is set on triggers action must be set by callers
|
2021-02-08 20:44:40 +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
|
8041ef641a
|
Merge branch 'develop' into dev_typent_jax_workcorrectly
|
2021-02-08 15:29:36 +01:00 |
|
Laurent Destailleur
|
f0e1c02caa
|
Look and feel v14 - Use placeholder on combolists
|
2021-02-06 00:05:24 +01:00 |
|
Laurent Destailleur
|
c441b54521
|
NEW If not logo defined, can use squarred logo on login page
|
2021-02-05 12:07:39 +01:00 |
|
Laurent Destailleur
|
54be4f282b
|
Fix bad function name
|
2021-02-05 10:56:33 +01:00 |
|
Laurent Destailleur
|
445e7a1e0c
|
Clean code
|
2021-02-04 10:58:07 +01:00 |
|
stickler-ci
|
149d2a1d55
|
Fixing style errors.
|
2021-02-04 08:52:16 +00:00 |
|
Florian HENRY
|
ec41bf58e5
|
always ajax now
|
2021-02-04 09:48:17 +01:00 |
|
Florian HENRY
|
2d77787bba
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly
|
2021-02-04 09:06:36 +01:00 |
|
Florian HENRY
|
86e9398b79
|
no inner join
|
2021-02-04 09:05:58 +01:00 |
|
Laurent Destailleur
|
f301635681
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2021-02-03 21:02:32 +01:00 |
|
Laurent Destailleur
|
9ac2dc1a6e
|
Fix phpcs
|
2021-02-03 20:42:30 +01:00 |
|
Laurent Destailleur
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +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
|
2e9656a5b2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
|
2021-02-02 03:26:20 +01:00 |
|
Laurent Destailleur
|
daf88944f8
|
FIX #16118 Timezone problem on some fields
|
2021-02-02 00:19:41 +01:00 |
|
Laurent Destailleur
|
b349290cd1
|
Fix test for date in future
|
2021-01-31 12:57:54 +01:00 |
|
Laurent Destailleur
|
7887d4cc8e
|
Fix price2num on all GETPOST('remise_percent')
|
2021-01-31 12:48:40 +01:00 |
|
Laurent Destailleur
|
b24aac1e6b
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
|
2021-01-31 12:03:39 +01:00 |
|
Laurent Destailleur
|
044b4eee48
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/expedition/list.php
|
2021-01-31 11:54:45 +01:00 |
|
Laurent Destailleur
|
244ee05a9c
|
FIX #14290 #15900
|
2021-01-30 18:09:13 +01:00 |
|
Laurent Destailleur
|
9ec5ba46fb
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2021-01-28 14:47:06 +01:00 |
|
Laurent Destailleur
|
f462e353e9
|
FIX #16079
|
2021-01-28 09:59:13 +01:00 |
|
Laurent Destailleur
|
62a5c8b6da
|
FIX Bad balance of begin commit
|
2021-01-15 15:34:24 +01:00 |
|
Laurent Destailleur
|
8e1128ef10
|
FIX Bad balance of begin commit
|
2021-01-15 15:33:12 +01:00 |
|
Laurent Destailleur
|
828f1c8314
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
|
2021-01-15 14:04:22 +01:00 |
|
Laurent Destailleur
|
cac7fdd058
|
Look and feel v13
|
2021-01-15 14:02:18 +01:00 |
|
Laurent Destailleur
|
e5126885fb
|
Fix css
|
2021-01-15 13:27:45 +01:00 |
|
Laurent Destailleur
|
3e85aec9a5
|
Fix url
|
2021-01-15 13:24:37 +01:00 |
|
Laurent Destailleur
|
d7a776ad8a
|
Fix url
|
2021-01-15 13:23:59 +01:00 |
|
Laurent Destailleur
|
e3a1cabd87
|
Merge pull request #15942 from bb2a/add_alias_on_lists
NEW Add column "alias" of company in list of proposal, order, invoice
|
2021-01-11 15:56:22 +01:00 |
|
Laurent Destailleur
|
e2598f5af3
|
NEW Add check to avoid invoice date in future
|
2021-01-11 15:34:25 +01:00 |
|
Laurent Destailleur
|
0c34543145
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-11 15:20:15 +01:00 |
|
Laurent Destailleur
|
d859072202
|
Fix GETPOST
|
2021-01-11 15:19:47 +01:00 |
|
Laurent Destailleur
|
4a919a8c6a
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-11 15:16:33 +01:00 |
|
Laurent Destailleur
|
25a703526e
|
Fix GETPOST
|
2021-01-11 15:16:01 +01:00 |
|
Laurent Destailleur
|
5bd59cd6d1
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-11 13:37:59 +01:00 |
|
Laurent Destailleur
|
8debb58f7c
|
Fix rounding of currency unit prices
|
2021-01-11 13:36:53 +01:00 |
|
Laurent Destailleur
|
16253a79ee
|
FIX GETPOST of qty with wrong parameters
Conflicts:
htdocs/bom/bom_card.php
|
2021-01-11 13:11:40 +01:00 |
|
Laurent Destailleur
|
f3e28c2dd0
|
FIX GETPOST of qty with wrong parameters
|
2021-01-11 13:00:29 +01:00 |
|
Anthony Berton
|
59ea907b18
|
Update list.php
|
2021-01-10 22:47:30 +01:00 |
|
Florian HENRY
|
dfaf77b03f
|
merge develop
|
2021-01-03 15:14:34 +01:00 |
|
Laurent Destailleur
|
150b338764
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-02 17:02:08 +01:00 |
|
Laurent Destailleur
|
7b3ed7301d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2021-01-02 17:01:03 +01:00 |
|
Laurent Destailleur
|
fd4dab495f
|
FIX Bad cleaning of VAT rate when numbers are into code
|
2021-01-02 16:51:34 +01:00 |
|
Laurent Destailleur
|
1ab459e854
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-02 16:19:08 +01:00 |
|
Laurent Destailleur
|
ce0abd17fe
|
Debug v13
|
2021-01-02 16:18:16 +01:00 |
|
Laurent Destailleur
|
020caf8809
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-30 23:52:36 +01:00 |
|
Laurent Destailleur
|
60d1b08f84
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/takepos/invoice.php
|
2020-12-30 22:58:40 +01:00 |
|
Laurent Destailleur
|
65edc377c3
|
FIX Visible date of payment
|
2020-12-30 22:53:21 +01:00 |
|
lvessiller
|
d4a19e5968
|
NEW add total margin in invoice list
|
2020-12-28 16:20:59 +01:00 |
|
Laurent Destailleur
|
a6eb14f68b
|
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
|
2020-12-27 15:06:35 +01:00 |
|
Laurent Destailleur
|
b66ec5bc64
|
Fix css
|
2020-12-23 23:16:27 +01:00 |
|
Laurent Destailleur
|
d65dc85a10
|
FIX for php 8
|
2020-12-23 19:16:25 +01:00 |
|
Laurent Destailleur
|
bac2ae0d5f
|
Fix warnings
|
2020-12-22 17:33:17 +01:00 |
|
Laurent Destailleur
|
4ed14d4903
|
Fix title not saved
|
2020-12-19 18:52:05 +01:00 |
|
Laurent Destailleur
|
832db82fce
|
Fix warnings
|
2020-12-18 14:40:45 +01:00 |
|
Laurent Destailleur
|
3b8947dadd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
|
2020-12-17 21:50:05 +01:00 |
|
Laurent Destailleur
|
2c7d872320
|
Fix warning
|
2020-12-16 11:07:34 +01:00 |
|
Laurent Destailleur
|
bf01ad8790
|
Fix warning
|
2020-12-16 10:55:33 +01:00 |
|
atm-lena
|
cb2c1f3ece
|
FIX Facture Situation Out : status condition
|
2020-12-16 10:54:32 +01:00 |
|
Laurent Destailleur
|
b991badb8c
|
Fix warning
|
2020-12-14 13:03:43 +01:00 |
|
Laurent Destailleur
|
3d33d3aa3a
|
Fix warning
|
2020-12-13 14:36:00 +01:00 |
|
Laurent Destailleur
|
d9ba821411
|
Merge pull request #15669 from frederic34/template
typo ortho
|
2020-12-07 22:35:45 +01:00 |
|
Laurent Destailleur
|
efc3bad7c6
|
Merge pull request #15678 from frederic34/fk_element
doxygen
|
2020-12-07 22:31:08 +01:00 |
|
Laurent Destailleur
|
a87ef49172
|
Fix remove warning
|
2020-12-06 17:59:49 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Frédéric FRANCE
|
d1204e5e9b
|
typo ortho
|
2020-12-05 15:35:52 +01:00 |
|
Laurent Destailleur
|
0db72852fb
|
Fix height of graph
|
2020-12-03 20:18:37 +01:00 |
|
Laurent Destailleur
|
d8d825f615
|
FIX #15519
|
2020-12-03 14:40:14 +01:00 |
|
Laurent Destailleur
|
9e18997e64
|
FIX #15595
|
2020-12-02 16:35:43 +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 |
|
Christian Foellmann
|
f801dd7d66
|
PR toggle FCKeditor on public/private notes
|
2020-11-30 16:39:14 +01:00 |
|
Laurent Destailleur
|
958893228a
|
Fix combo to add contact and status of contact on popup
|
2020-11-30 15:18:58 +01:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
d3a2aa664f
|
FIX #15572
|
2020-11-29 20:27:40 +01:00 |
|
Laurent Destailleur
|
6c65ebef0d
|
Look and feel v13
|
2020-11-29 15:16:53 +01:00 |
|
Laurent Destailleur
|
85a6a296c8
|
Fix links
|
2020-11-28 19:13:17 +01:00 |
|
Laurent Destailleur
|
59b445a103
|
Clean dead code
|
2020-11-28 14:47:39 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Laurent Destailleur
|
69b06a25e8
|
Fix code of deletion of objects
|
2020-11-26 09:16:16 +01:00 |
|
Laurent Destailleur
|
0ad0035f19
|
Update list.php
|
2020-11-25 12:47:10 +01:00 |
|
Florian HENRY
|
4a316f06d5
|
fix : finish bank transfert fourn from list
|
2020-11-25 10:24:44 +01:00 |
|
Laurent Destailleur
|
81566289cd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
|
2020-11-24 11:07:35 +01:00 |
|
Laurent Destailleur
|
890f7a0602
|
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
FIX Dol print error : conf usage thirdparty propagate extrafields to
|
2020-11-23 21:43:03 +01:00 |
|
ATM john
|
fbc911aea1
|
Fix conf usage thirdparty propagate extrafields to
|
2020-11-23 16:40:31 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Florian HENRY
|
46326d7659
|
merge from develop
|
2020-11-19 13:53:34 +01:00 |
|
Laurent Destailleur
|
6c42535eb2
|
Maxi debug v13
|
2020-11-16 12:20:18 +01:00 |
|
Laurent Destailleur
|
90884d8085
|
Fix compatibility with date_delivery
|
2020-11-11 18:08:40 +01:00 |
|
Laurent Destailleur
|
6536208a14
|
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
NEW include tpl for loading lang file for extra fields in list
|
2020-11-10 14:42:21 +01:00 |
|
Laurent Destailleur
|
47b3b30aaa
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
|
2020-11-10 11:10:35 +01:00 |
|
Florian Mortgat
|
bf27c56fa7
|
Following PR#15336: it should not be possible to modify the third party of an invoice
|
2020-11-09 17:09:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
f6e3f58fcb
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-11-09 14:18:56 +00:00 |
|
Laurent Destailleur
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Laurent Destailleur
|
e103503bb1
|
Fix warning php8
|
2020-11-08 12:34:45 +01:00 |
|
Laurent Destailleur
|
d04bbe09b7
|
Fix syntax error
|
2020-11-08 00:38:12 +01:00 |
|
Laurent Destailleur
|
a9fbe9dd6c
|
Fix remove warning
|
2020-11-08 00:18:41 +01:00 |
|
Laurent Destailleur
|
e2f5a302be
|
Fix warning
|
2020-11-07 23:04:23 +01:00 |
|
lvessiller
|
4ddff7173f
|
NEW include tpl for loading lang file for extra fields in list
|
2020-11-06 12:19:45 +01:00 |
|
Laurent Destailleur
|
ac6f8e4e7c
|
Debug v13
|
2020-11-06 11:52:48 +01:00 |
|
Laurent Destailleur
|
1a2d094ce7
|
Removed dead code
|
2020-11-04 18:50:49 +01:00 |
|
Laurent Destailleur
|
9e967a578e
|
FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE
|
2020-11-03 02:17:51 +01:00 |
|
Laurent Destailleur
|
3df0d5dc22
|
FIX #15268
|
2020-11-02 20:05:06 +01:00 |
|
Laurent Destailleur
|
83a7b19333
|
Look and feel v13
|
2020-11-02 11:41:07 +01:00 |
|
Laurent Destailleur
|
e0ed89c514
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
|
2020-11-01 17:58:41 +01:00 |
|
Laurent Destailleur
|
72160deef7
|
FIX #14979
|
2020-11-01 17:01:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Frédéric FRANCE
|
8daf0c168c
|
Update facture.class.php
|
2020-10-31 13:27:29 +01:00 |
|
Frédéric FRANCE
|
8190711342
|
doxygen
|
2020-10-30 18:01:01 +01:00 |
|
Florian HENRY
|
d77a0b40a8
|
tested and approuve feaure #15036
|
2020-10-28 16:37:41 +01:00 |
|
Florian HENRY
|
a3073be8e4
|
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
|
2020-10-28 08:52:29 +01:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Florian HENRY
|
8c935661ee
|
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
|
2020-10-26 10:29:35 +01:00 |
|
Laurent Destailleur
|
2638d4596a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
|
2020-10-25 21:33:13 +01:00 |
|
Laurent Destailleur
|
6bc0630c5f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/boxes/box_services_contracts.php
|
2020-10-25 21:09:43 +01:00 |
|
Florian HENRY
|
7c2b5b614f
|
NEW: preload product description on selection for customer propal/order/invoice
|
2020-10-25 19:13:09 +01:00 |
|
Maxime Kohlhaas
|
309691f1e7
|
Fix #15143 selected lines on invoice creation
|
2020-10-25 09:28:41 +01:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Laurent Destailleur
|
3bab0a322d
|
Merge pull request #15110 from frederic34/dol_fiche_head
replace deprecated
|
2020-10-23 04:03:46 +02:00 |
|
Laurent Destailleur
|
254da6923b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/line.php
|
2020-10-23 04:00:45 +02:00 |
|
Laurent Destailleur
|
0e25843baa
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
|
2020-10-23 03:59:11 +02:00 |
|
Laurent Destailleur
|
62420c5e7b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/fourn/facture/card.php
|
2020-10-23 03:51:22 +02:00 |
|
Laurent Destailleur
|
d9aa83e699
|
Fix phpcs
|
2020-10-23 03:41:26 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
b4581b6af8
|
Better error management
|
2020-10-22 18:39:45 +02:00 |
|
Marc de Lima Lucio
|
594d9e321e
|
FIX: invoice payment terms edition: error management
|
2020-10-22 18:28:27 +02:00 |
|
Laurent Destailleur
|
fb7202b7f8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-22 17:55:47 +02:00 |
|
Laurent Destailleur
|
0616b9bc9b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-10-22 17:55:38 +02:00 |
|
Philippe GRAND
|
fae572d43a
|
fix : deprecated
|
2020-10-22 16:29:17 +02:00 |
|
Laurent Destailleur
|
1a70c016c5
|
Merge pull request #15093 from OPEN-DSI/new-invoice-list-margin-info-rights
Add rights on margin info on invoice list
|
2020-10-22 15:49:05 +02:00 |
|
lvessiller
|
b13ef34804
|
NEW add rights on margin info on invoice list
|
2020-10-22 14:56:53 +02:00 |
|
Pierre Penelon
|
1d218b3260
|
Linting api_invoices.class.php
|
2020-10-22 09:56:13 +02:00 |
|
Pierre Penelon
|
b8cb080f0d
|
ADD Retrieve discount from invoice from API
As I was unable to retrieve discount ID of created discount from invoice with API.
This commit add a route to get discount from a specific invoice ID.
|
2020-10-22 09:26:46 +02:00 |
|
lvessiller
|
9b423106dc
|
NEW add margin info in invoice list
|
2020-10-21 16:10:48 +02:00 |
|
John Botella
|
70790009a9
|
Fix display warranty fields on page load
|
2020-10-21 14:49:51 +02:00 |
|
Laurent Destailleur
|
7504f92a41
|
Standardize code and look and feel
|
2020-10-16 13:30:20 +02:00 |
|
Laurent Destailleur
|
fcd4645509
|
Standardize code: Property product_libelle renamed into product_label
Move common vars declaration into parent class.
|
2020-10-12 19:33:00 +02:00 |
|
Alexandre SPANGARO
|
ae64e513a8
|
FIX #14956 Add a possibility to modify date on credit note invoice
|
2020-10-10 07:19:13 +02:00 |
|