lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

5331 Commits

Author SHA1 Message Date
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Antonin MARCHAL
779c868eae fix mistake and removed hookmanager unused 2021-05-17 13:48:21 +02:00
Antonin MARCHAL
c6aa078892 renamed LibStatut hook + removed useless hook 2021-05-17 13:46:01 +02:00
Laurent Destailleur
4e5a3a22c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995 Add missing property 2021-05-17 13:36:27 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
stickler-ci
ea0d860593 Fixing style errors. 2021-05-12 14:55:32 +00:00
Antonin MARCHAL
1bfcfc3a0c rename Hook and moved it into LibStatut method 2021-05-12 16:55:03 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode 
uniformize supplier cards
 2021-05-11 19:25:26 +02:00
Laurent Destailleur
6bec5d7e3c
Update document.php 2021-05-11 19:23:46 +02:00
Laurent Destailleur
70451050ae
Update contact.php 2021-05-11 19:22:46 +02:00
Laurent Destailleur
1c477d2131
Update card.php 2021-05-11 19:21:38 +02:00
Laurent Destailleur
e3cb04e235
Merge pull request #17540 from ibuiv/ibuiv-supplierorder-hooks 
New Hooks for Supplier Order Card tabs
 2021-05-11 19:12:24 +02:00
Laurent Destailleur
a4f9025843
Merge pull request #17541 from fappels/14_debug_dispatch 
Fix edit-delete from dispatch card when reception activated.
 2021-05-11 19:03:18 +02:00
Frédéric FRANCE
dc90103526
Update document.php 2021-05-11 18:36:27 +02:00
Laurent Destailleur
88ca25903d
Merge pull request #17559 from aspangaro/14b7 
Fix Title supplier order
 2021-05-11 18:15:02 +02:00
Laurent Destailleur
8a2a996595
Merge pull request #17562 from oscim/patch-42 
Update card.php
 2021-05-11 18:10:07 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode 2021-05-11 18:09:05 +02:00
Alexandre SPANGARO
a830e498de Merge remote-tracking branch 'upstream/develop' into 14b7 2021-05-11 07:01:39 +02:00
Laurent Destailleur
d7a5e342ab Optimize some widgets 2021-05-10 20:16:51 +02:00
stickler-ci
b9bdd9ed8a Fixing style errors. 2021-05-10 12:13:50 +00:00
oscim
dfe0ccee45
Update card.php 
Add hook for block boxstats in fourn card
 2021-05-10 14:10:54 +02:00
Laurent Destailleur
ed18045807 FIX The comment of a reception was not correctly managed 2021-05-10 11:30:37 +02:00
Francis Appels
cd8c71497d replace deprecated warehouse 'libelle' 2021-05-10 10:10:30 +02:00
Alexandre SPANGARO
7993e4634a Fix Title supplier order info card 2021-05-10 07:01:24 +02:00
Alexandre SPANGARO
eccd883156 Fix Title supplier order document card 2021-05-10 06:54:17 +02:00
Alexandre SPANGARO
db50f8c27b Fix Title supplier order note card 2021-05-10 06:49:49 +02:00
Alexandre SPANGARO
9f0cdb0153 Fix Title supplier order contact card 2021-05-10 06:48:27 +02:00
Alexandre SPANGARO
1f00689831 Fix Title supplier order card 2021-05-10 06:46:07 +02:00
antonin_tdj
60671f1c78
Merge pull request #1 from ibuiv/ibuiv-develop 
Ibuiv develop
 2021-05-08 15:55:15 +02:00
Francis Appels
7101c2445d Fix dispatch, only edit received lines on draft reception. 
No stock movement on reception.
 2021-05-08 12:42:58 +02:00
Antonin MARCHAL
6b55b9fb28 add (hooks) init hooks on all tabs for supplier order 2021-05-08 11:45:07 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards 2021-05-07 21:28:35 +02:00
Antonin MARCHAL
a91d1b2e07 add(list) hook 2021-05-07 17:09:39 +02:00
Antonin MARCHAL
c6d646f39e add(prop)list 2021-05-07 17:08:36 +02:00
Antonin MARCHAL
9ab12e2455 add (getNomUrl) 2021-05-07 17:06:53 +02:00
Laurent Destailleur
914d27990d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 14:58:41 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
e5b49ce0a2
Merge pull request #17448 from LuferGonn/fourn_facture_change_001 
Update fourn/facture/card.php: Change position(ExtraFields)
 2021-05-03 14:12:07 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
Luis Fernando
6fb256822b Update card.php: Change position(ExtraFields) 2021-04-30 21:07:24 -05:00
Laurent Destailleur
edd178c373
Update list.php 2021-04-30 12:09:42 +02:00
lmarcouiller
484f6f275f Fix #17424 : preg_match error on List of purchase orders 2021-04-30 10:56:47 +02:00
stickler-ci
8fda2ba2b4 Fixing style errors. 2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
kamel
4b490d434c Corrections 2021-04-27 18:08:05 +02:00
kamel
80be0c32e4 Corrections 2021-04-27 14:13:59 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
kamel
c645241327 Corrections 2021-04-27 12:11:28 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
kamel
9f3bcbc39d Fix Stickler CI 2021-04-26 17:48:42 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +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
89d960f6dd Field tva is deprecated 2021-04-17 08:13:59 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
fr69400
bd5c03f1a0 Update contact.php 2021-04-16 11:02:17 +02:00
fr69400
6ea94c6e0c
Update contact.php 2021-04-16 10:36:24 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
7e4dcde089
Merge pull request #17257 from ibuiv/patch-4 
Fix Infinite Loop in trigger
 2021-04-13 23:01:28 +02:00
Laurent Destailleur
1c8a2ce15a Fix phpcs 2021-04-13 22:12:47 +02:00
Laurent Destailleur
97292d6843 Fix phpcs 2021-04-13 20:28:25 +02:00
stickler-ci
0511d5848e Fixing style errors. 2021-04-13 18:24:18 +00:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
ibuiv
2a391dc13f
Fix Loop in trigger with CommandeFournisseur::createFromClone 
added param $notrigger to avoid an infinite loop when createFromClone calls create
 2021-04-13 20:19:02 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2 Clean code of ol deprecated option 2021-04-12 15:37:26 +02:00
Alexandre SPANGARO
fb221a0541 Add right supplier_order 2021-04-12 09:59:03 +02:00
Alexandre SPANGARO
8d72448f43 Add right supplier_order 2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
87cc1b2601 Add right supplier_invoice 2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
2d77b9bdf0 Work on split module fournisseur 2021-04-12 06:15:47 +02:00
Alexandre SPANGARO
ab5599a672 Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-11 20:53:30 +02:00
Laurent Destailleur
0ab31a8680 Look and feel v14 2021-04-11 13:30:30 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
280d534b7a Fix phpcs 2021-04-10 00:29:32 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Laurent Destailleur
60711f415d Fix permission on external user 2021-04-08 19:52:07 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Laurent Destailleur
c4a4d238f7
Merge pull request #17151 from OGPayet/fix/fournPayment 
fix paiementfourn ref is now different from id
 2021-04-08 16:26:34 +02:00
UT from dolibit
a144ae147f
Create index.html 2021-04-07 19:36:13 +02:00
Laurent Destailleur
6dc10bc87d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-04-07 12:19:39 +02:00
Pierre Payet
d209dbe43e add missing hooks in fourn invoice list 2021-04-07 11:01:51 +02:00
Marc de Lima Lucio
7df09b6e9e FIX: esupplier order: error 500 when using packaging with product where it is not defined 2021-04-07 10:41:36 +02:00
Pierre Payet
113db33a24 fix paiementfourn ref is now different from id 2021-04-07 10:24:02 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Laurent Destailleur
1f76a99ee4 Fix status in popup 2021-04-06 23:07:47 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Laurent Destailleur
90b122035f Fix css 2021-04-06 20:28:00 +02:00
Laurent Destailleur
5c0f0834dc css 2021-04-06 20:23:44 +02:00
Laurent Destailleur
98e567a8f7 Fix css 2021-04-06 20:21:54 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
stickler-ci
30d26c1e28 Fixing style errors. 2021-04-06 07:20:07 +00:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
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
231f441876 Look and feel v14 2021-04-03 02:11:16 +02:00
Laurent Destailleur
60e13f6727 FIX #17060 2021-04-02 22:20:13 +02:00
Laurent Destailleur
32d1bce677 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/paiement/list.php
 2021-04-02 01:43:39 +02:00
Laurent Destailleur
b078c2dcc9
Update list.php 2021-04-02 01:34:53 +02:00
Ferran Marcet
75d395c848 FIX: Filter on supplier payment list 2021-04-01 14:13:59 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +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
d93fbcd00b Fix sql error 2021-03-29 21:17:41 +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
85f6a15678 Fix position of users in combo list 2021-03-29 11:58:51 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Laurent Destailleur
01c1101b29 Look and feel v14 2021-03-26 18:16:12 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
2d5fbfc105 Fix php8 2021-03-22 23:43:28 +01:00
Laurent Destailleur
4ff26bd8c5 Removed deprecated code 2021-03-22 13:39:34 +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
bb57d773e9
Merge pull request #16869 from frederic34/patch-20 
fix doxygen
 2021-03-20 11:16:18 +01:00
Frédéric FRANCE
0cacdf3320
fix doxygen 2021-03-20 10:11:56 +01:00
Frédéric FRANCE
1bc3301a7f
fix doxygen 2021-03-20 10:10:41 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +01:00
Laurent Destailleur
aba4af85a5
Merge pull request #16722 from aspangaro/14a26 
Uniformize translation
 2021-03-16 10:24:42 +01:00
Laurent Destailleur
39849de96e Look and feel v14 2021-03-16 10:19:56 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
f8703a0691 Translation "Generated documents" 2021-03-16 04:04:33 +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
Juanjo Menent
76cf3da449 FIX: Cannot delete a batch material from item receipts 2021-03-15 18:10:59 +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
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity 
Unique serial number management
 2021-03-06 11:22:44 +01:00
Laurent Destailleur
c55932090a Fix phpcs 2021-03-04 19:48:08 +01:00
Christophe Battarel
faf7b1d659 adapt dispatch for serial numbers 2021-03-04 15:31:51 +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
Laurent Destailleur
23e8401e61 FIX #16296 2021-03-02 01:22:23 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Laurent Destailleur
5b771eb798 Fix merge of 2 record. 2021-03-01 21:56:14 +01:00
Alexandre SPANGARO
94a861c1c8 Code enhanced - Standardize field name 2021-03-01 04:07:31 +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
68aebaeade
Merge pull request #16479 from frederic34/update_CommandeFournisseur 
add update CommandeFournisseur for api use
 2021-02-28 13:26:28 +01:00
Laurent Destailleur
dd64c00f8b
Merge pull request #16478 from frederic34/patch-5 
fix missing include
 2021-02-28 13:24:42 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Frédéric FRANCE
6823eabe63
add update CommandeFournisseur for api use 2021-02-27 10:10:28 +01:00
Frédéric FRANCE
8a782e1d4a
fix missing include 
needed by dol_get_last_hour
 2021-02-27 09:18:03 +01:00
Laurent Destailleur
4c7d78ffaa Look and feel v14 2021-02-27 03:06:21 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +01:00
Laurent Destailleur
8e632d08b8 NEW Add link picto to the stock movement on the detail of production 2021-02-27 00:31:29 +01:00
Laurent Destailleur
e84e7d881f
Merge pull request #16447 from frederic34/fourn_code_syntax 
code syntax fourn directory
 2021-02-26 10:29:42 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory 2021-02-25 23:21:30 +01:00
Frédéric FRANCE
464e4442b1
fix fourn card 2021-02-23 18:23:14 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
93381f1d7d Fix regression in renaming of field 2021-02-21 19:29:42 +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
3ff80ac1f8 FIX #16304 2021-02-19 14:15:58 +01:00
Laurent Destailleur
b6211a7990 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:12:00 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page 
FIX sql error on group by on payment list
 2021-02-19 12:35:26 +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
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
lmarcouiller
b83b5e0a42 Fix format error in graph in fourn/commande/index.php 2021-02-11 15:36:11 +01:00
Laurent Destailleur
09629d32d7 Fix missing properties in fetch 2021-02-11 14:53:29 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Laurent Destailleur
d588086c47 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 21:21:28 +01:00
Laurent Destailleur
e1af57f540 FIX status late on purchase orders 2021-02-09 20:46:17 +01:00
Laurent Destailleur
eae232da50 Fix sql error 2021-02-09 19:16:26 +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
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
0da942210f
deprecate non camelCaps functions 2021-02-09 09:55:48 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions 2021-02-09 09:49:37 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Laurent Destailleur
a143635f53 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:17 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Laurent Destailleur
dbabd12745 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-07 20:16:56 +01:00
Laurent Destailleur
8bda726619 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/notify/card.php
 2021-02-07 20:16:13 +01:00
Laurent Destailleur
21d3519d42 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-07 20:13:38 +01:00
Maxime Kohlhaas
414a2366fb Fix links to go back on supplier invoice list 2021-02-07 19:28:00 +01:00
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Laurent Destailleur
67df1e1b94 Use same visual picto everywhere for nature of thirdparty 2021-02-05 17:29:11 +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