Frédéric FRANCE
|
9dc2cc82cb
|
Update supplier_proposal.class.php
|
2022-02-15 17:07:43 +01:00 |
|
Laurent Destailleur
|
045cd5e810
|
Fix phpcs
|
2022-01-30 02:05:07 +01:00 |
|
Laurent Destailleur
|
05ef2c714e
|
Update supplier_proposal.class.php
|
2022-01-28 18:54:47 +01:00 |
|
Jay Yeo
|
8c403655a7
|
FIX supplier_proposal when line update price U.P change 0 modify
|
2022-01-28 18:54:38 +01:00 |
|
Gauthier PC portable 024
|
3abe391f65
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-01-28 15:08:02 +01:00 |
|
Laurent Destailleur
|
13510b9929
|
Clean sortfield, sortorder
|
2022-01-13 11:17:25 +01:00 |
|
Gauthier PC portable 024
|
6799d48944
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-01-11 09:59:25 +01:00 |
|
Laurent Destailleur
|
0387b9922e
|
FIX error message on sqlfilter in API
|
2021-12-20 20:49:32 +01:00 |
|
Laurent Destailleur
|
98ddfbf792
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/compta/facture/info.php
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/fourn/facture/list.php
htdocs/mrp/mo_movements.php
htdocs/product/stock/movement_card.php
htdocs/product/stock/movement_list.php
htdocs/product/stock/replenishorders.php
htdocs/reception/card.php
htdocs/supplier_proposal/list.php
|
2021-12-19 00:17:37 +01:00 |
|
Laurent Destailleur
|
39b4586957
|
Merge pull request #19624 from 1ocate/FIX_05_author_searching_include_first_and_last_name
Fix author searching include first and last name
|
2021-12-16 17:09:44 +01:00 |
|
Laurent Destailleur
|
f8e6befe35
|
Fix link on user
|
2021-12-16 16:47:11 +01:00 |
|
Jay Yeo
|
41e4e70c6e
|
Fix author searching include first and last name
|
2021-12-16 16:28:45 +07:00 |
|
Jay Yeo
|
7c1879a11a
|
Fix author searching include first and last name
|
2021-12-15 16:52:57 +07:00 |
|
Laurent Destailleur
|
bb1d5daa82
|
css
|
2021-12-12 23:47:40 +01:00 |
|
Frédéric FRANCE
|
5e2dcf322c
|
Update supplier_proposal.class.php
|
2021-11-23 22:17:05 +01:00 |
|
Frédéric FRANCE
|
bc4ce6725a
|
fix undefined variable $result
|
2021-11-23 22:14:25 +01:00 |
|
Frédéric FRANCE
|
799862362d
|
can merge products but experimental
|
2021-11-23 22:03:46 +01:00 |
|
Frédéric FRANCE
|
429e5cf517
|
can merge products but experimental
|
2021-11-23 22:02:55 +01:00 |
|
Gauthier PC portable 024
|
2c2f456827
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-23 11:10:01 +01:00 |
|
Gauthier PC portable 024
|
74f5c092dc
|
FIX : use $linecount = count($this->lines);
|
2021-11-23 10:44:43 +01:00 |
|
Gauthier PC portable 024
|
9840c1e0fa
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-22 16:17:55 +01:00 |
|
Gauthier PC portable 024
|
e75b6ae0b4
|
FIX : it's better with an input number
|
2021-11-22 16:13:46 +01:00 |
|
Gauthier PC portable 024
|
72614ecc0d
|
Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-16 16:43:01 +01:00 |
|
Gauthier PC portable 024
|
375dcf7028
|
FIX : dev name
|
2021-11-16 16:42:48 +01:00 |
|
stickler-ci
|
19171d4f8e
|
Fixing style errors.
|
2021-11-16 15:15:55 +00:00 |
|
Gauthier PC portable 024
|
9d41c1390d
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-16 14:20:24 +01:00 |
|
Gauthier PC portable 024
|
1e0d7d92a9
|
NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled
|
2021-11-16 14:09:18 +01:00 |
|
Christian Foellmann
|
28e14ac336
|
fix permission on supplier_order document upload
|
2021-11-11 13:29:30 +01:00 |
|
Laurent Destailleur
|
fe7e1d4118
|
Look and feel v15
|
2021-10-29 09:40:38 +02:00 |
|
Scrutinizer Auto-Fixer
|
5567310e44
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2021-10-25 20:07:31 +00:00 |
|
Laurent Destailleur
|
ad2e567571
|
Fix bug huntr.dev
|
2021-10-25 15:32:10 +02:00 |
|
Laurent Destailleur
|
f2cd7a7a56
|
Removed the div class="ficheaddleft"
|
2021-10-24 00:37:37 +02:00 |
|
Laurent Destailleur
|
8604f9b153
|
Clean DOM (remove ficheaddleft div)
|
2021-10-23 17:18:35 +02:00 |
|
Frédéric FRANCE
|
46c4f28478
|
fix multiple warnings
|
2021-10-22 22:15:59 +02:00 |
|
Laurent Destailleur
|
f8010dfcbc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
|
2021-10-16 13:01:03 +02:00 |
|
lvessiller
|
be4a00213c
|
FIX optional visibility on create card
|
2021-10-08 15:58:08 +02:00 |
|
Vincent Dieltiens
|
6553defc14
|
Reload page if RELOAD_PAGE_ON_SUPPLIER_CHANGE is not empty
|
2021-10-08 13:17:43 +02:00 |
|
Laurent Destailleur
|
37603b451a
|
Fix token in url
|
2021-09-27 12:24:01 +02:00 |
|
Laurent Destailleur
|
5c8fb38426
|
Fix add del* action into list of sensitive actions
|
2021-09-19 14:41:46 +02:00 |
|
Laurent Destailleur
|
d760686239
|
Fix case of newtoken()
|
2021-09-18 22:24:00 +02:00 |
|
Laurent Destailleur
|
0749d01c5a
|
Fix add action delete* as sensitive action
|
2021-09-18 22:04:41 +02:00 |
|
Laurent Destailleur
|
8bdc53f469
|
Fix Add action classify as sensitive actions
|
2021-09-18 20:49:24 +02:00 |
|
Laurent Destailleur
|
62b721a904
|
Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
|
2021-09-18 19:34:46 +02:00 |
|
Laurent Destailleur
|
034c5651c8
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
|
2021-09-08 22:13:35 +02:00 |
|
Laurent Destailleur
|
30856d5b18
|
FIX Relative discount with high nb of decimals
|
2021-09-08 22:09:02 +02:00 |
|
Laurent Destailleur
|
94e708d196
|
Fix sql error
|
2021-09-03 21:59:13 +02:00 |
|
Laurent Destailleur
|
ee066ad725
|
Cast sql var
|
2021-09-03 21:25:43 +02:00 |
|
Laurent Destailleur
|
77e9f15360
|
Work on #18448
|
2021-09-02 22:52:17 +02:00 |
|
Laurent Destailleur
|
d2d7b0defd
|
Fix duplicate ;
|
2021-08-31 20:15:41 +02:00 |
|
Laurent Destailleur
|
fb8723d884
|
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
|
2021-08-28 18:39:06 +02:00 |
|
Laurent Destailleur
|
0db67b40a0
|
Merge pull request #18525 from cfoellmann/PR/thirdparty-links
change links for thirdparty to target the type customer|supplier tab
|
2021-08-28 15:27:13 +02:00 |
|
Laurent Destailleur
|
3d72a21396
|
Clean code
|
2021-08-28 03:09:41 +02:00 |
|
Laurent Destailleur
|
51a4d7630f
|
Clean code
|
2021-08-28 00:56:37 +02:00 |
|
Laurent Destailleur
|
2dd91bf312
|
Clean code
|
2021-08-27 23:36:06 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Christian Foellmann
|
9752501ef6
|
change links for thirdparty to target the type customer|supplier tab
|
2021-08-27 15:32:53 +02:00 |
|
Christian Foellmann
|
f094b4c70c
|
fix up most of the remaining submit inputs
|
2021-08-24 17:04:17 +02:00 |
|
Laurent Destailleur
|
22339a3ed3
|
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
|
2021-08-24 15:26:03 +02:00 |
|
Laurent Destailleur
|
dc006b0ebb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2021-08-23 19:44:02 +02:00 |
|
Laurent Destailleur
|
8485fee5f9
|
Cast numeric into on sql request
|
2021-08-23 19:33:24 +02:00 |
|
Laurent Destailleur
|
d4b5ee6c85
|
Fix cast into variable into sql request.
|
2021-08-23 17:41:11 +02:00 |
|
Christian Foellmann
|
d706c3b1ec
|
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
|
2021-08-20 14:41:30 +02:00 |
|
Laurent Destailleur
|
3ee4a6556a
|
Merge branch 'develop' into undefined
|
2021-08-19 13:43:32 +02:00 |
|
Alexandre SPANGARO
|
c03b71dff3
|
NEW Supplier proposal - Add From/to input on search date
|
2021-08-18 21:41:11 +02:00 |
|
Gurvan Kervern
|
9253034007
|
Update list.php
|
2021-08-18 17:43:45 +08:00 |
|
Gurvan Kervern
|
f9c4ea8f6a
|
fix warnings3
Fixing PHP8 warnings
|
2021-08-16 18:37:39 +08:00 |
|
Laurent Destailleur
|
d7317025e9
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/pdf_other.php
|
2021-08-11 22:09:05 +02:00 |
|
Christian Foellmann
|
e4cb1e023a
|
fix link to supplier card of thirdparty on supplier_order list
|
2021-08-09 15:39:04 +02:00 |
|
Laurent Destailleur
|
d91051488c
|
Merge pull request #18125 from fr69400/develop
NEW add hookmanager on note pages
|
2021-07-11 20:25:16 +02:00 |
|
stickler-ci
|
9ec1e7d50e
|
Fixing style errors.
|
2021-07-11 07:55:48 +00:00 |
|
fr69400
|
931d939d74
|
Update note.php
|
2021-07-11 09:55:18 +02:00 |
|
stickler-ci
|
4272f93aa4
|
Fixing style errors.
|
2021-07-09 16:41:41 +00:00 |
|
fr69400
|
e45d5c1d0d
|
NEW add hookmanager on note pages
|
2021-07-09 18:36:21 +02:00 |
|
Francis Appels
|
5d824899e5
|
Fix php 8 warning on home page
|
2021-07-05 13:44:05 +02:00 |
|
Laurent Destailleur
|
f6efe51032
|
Fix trouble with product id = -1
|
2021-07-04 21:02:02 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
fa4786a3f6
|
Fix permission
|
2021-06-08 16:19:21 +02:00 |
|
lvessiller
|
38bd595ebd
|
NEW translate supplier order menus and button
|
2021-05-21 14:18:46 +02:00 |
|
Alexandre SPANGARO
|
6089332a2b
|
Fix Title supplier proposal document card
|
2021-05-10 06:40:14 +02:00 |
|
Alexandre SPANGARO
|
7a105a054a
|
Fix Title supplier proposal info card
|
2021-05-10 06:40:01 +02:00 |
|
Alexandre SPANGARO
|
d66d38a846
|
Fix Title supplier proposal note card
|
2021-05-10 06:36:22 +02:00 |
|
Alexandre SPANGARO
|
100b0f297e
|
Fix Title supplier proposal contact card
|
2021-05-10 06:32:28 +02:00 |
|
Alexandre SPANGARO
|
7e44494a98
|
Fix Title supplier proposal card
|
2021-05-10 06:24:30 +02:00 |
|
Laurent Destailleur
|
1c95e2b7c7
|
FIX #17453
|
2021-05-03 14:58:29 +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 |
|
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 |
|
Laurent Destailleur
|
f6ed63c37d
|
Merge pull request #17409 from fr69400/develop
Update supplier_proposal.class.php
|
2021-04-27 18:39:37 +02:00 |
|
fr69400
|
c7c1756703
|
Update supplier_proposal.class.php
|
2021-04-27 18:22:31 +02:00 |
|
stickler-ci
|
3d38301be9
|
Fixing style errors.
|
2021-04-27 14:06:10 +00:00 |
|
fr69400
|
52f3c95429
|
Update supplier_proposal.class.php
|
2021-04-27 15:59:13 +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 |
|
fr69400
|
e678091b12
|
Update contact.php
|
2021-04-19 13:09:53 +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
|
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 |
|
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
|
8d72448f43
|
Add right supplier_order
|
2021-04-12 09:47:16 +02:00 |
|
Alexandre SPANGARO
|
b3744bce24
|
Work on split module fournisseur
|
2021-04-12 06:04:08 +02:00 |
|
Alexandre SPANGARO
|
ce7c5a0c7b
|
Work on split module fournisseur
|
2021-04-11 04:24:21 +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
|
12e847ade1
|
Fix color of reports. Fix include_once into include.
|
2021-04-06 22:18:32 +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
|
66ca619669
|
Merge pull request #16986 from asolslk/patch-6
Update contact.php
|
2021-03-29 17:13:52 +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 |
|
stickler-ci
|
20ae94b84b
|
Fixing style errors.
|
2021-03-27 08:08:26 +00:00 |
|
asolslk
|
992a4c7c21
|
Update contact.php
fix for issue #16985
|
2021-03-27 16:05:42 +08:00 |
|
Laurent Destailleur
|
01c1101b29
|
Look and feel v14
|
2021-03-26 18:16:12 +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
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
Frédéric FRANCE
|
bae1770176
|
uniformise comments to remove nested comments
|
2021-03-20 10:00:24 +01:00 |
|
Laurent Destailleur
|
704b8386ba
|
Merge pull request #16752 from frederic34/patch-11
fix php8 warnings
|
2021-03-17 17:01:07 +01:00 |
|
Frédéric FRANCE
|
567a65b44d
|
fix php8 warnings
|
2021-03-16 21:41:11 +01:00 |
|
UT from dolibit
|
a65f4e5990
|
Update card.php
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $langs->trans('CommRequests'), $help_url);
|
2021-03-16 16:35:35 +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
|
39849de96e
|
Look and feel v14
|
2021-03-16 10:19:56 +01:00 |
|
Alexandre SPANGARO
|
4fd24c6855
|
Translation "Generated documents"
|
2021-03-16 04:04:18 +01:00 |
|
Frédéric FRANCE
|
3acd681a42
|
fix php8 warning
|
2021-03-15 00:34:48 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +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
|
cffea1889f
|
FIX #16325
|
2021-03-02 01:17:28 +01:00 |
|
Frédéric FRANCE
|
9e8aefbc75
|
Merge remote-tracking branch 'upstream/develop' into s_code_syntax
|
2021-02-28 17:49:17 +01:00 |
|
Laurent Destailleur
|
5c0ea476e1
|
Look and feel v14
|
2021-02-27 12:45:07 +01:00 |
|
Frédéric FRANCE
|
ebfba19778
|
code syntax s... t.. dir
|
2021-02-26 21:17:52 +01:00 |
|
Laurent Destailleur
|
93381f1d7d
|
Fix regression in renaming of field
|
2021-02-21 19:29:42 +01:00 |
|
Alexandre SPANGARO
|
1017d480f9
|
Code enhanced - Standardize field name #14697
|
2021-02-20 07:08:37 +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
|
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 |
|
Laurent Destailleur
|
e84834d219
|
Merge pull request #16236 from grandoc/new_branch_09_02_2021
standardisation, internationalisation
|
2021-02-10 01:28:16 +01:00 |
|
Laurent Destailleur
|
408aefd46c
|
FIX vat value when code contains number
|
2021-02-10 01:10:31 +01:00 |
|
Philippe GRAND
|
2e52d00951
|
standardization, internationalisation
|
2021-02-09 14:28:18 +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 |
|
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 |
|
stickler-ci
|
5d1cceae1b
|
Fixing style errors.
|
2021-02-04 09:06:49 +00:00 |
|
Florian HENRY
|
b696f87415
|
always ajax now
|
2021-02-04 10:03:45 +01:00 |
|
Florian HENRY
|
ec41bf58e5
|
always ajax now
|
2021-02-04 09:48:17 +01:00 |
|
Laurent Destailleur
|
d047cf488d
|
Fix price2num
|
2021-01-31 12:51:11 +01:00 |
|
Laurent Destailleur
|
7887d4cc8e
|
Fix price2num on all GETPOST('remise_percent')
|
2021-01-31 12:48:40 +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
|
745e2be678
|
FIX encoding status in graph of vendor proposals
|
2021-01-28 16:00:22 +01:00 |
|
Laurent Destailleur
|
cac7fdd058
|
Look and feel v13
|
2021-01-15 14:02:18 +01:00 |
|
Laurent Destailleur
|
f9f84f84ba
|
Fix rounding of foreign amount
|
2021-01-11 13:46:23 +01:00 |
|
Laurent Destailleur
|
3a2230e41d
|
Fix rounding
|
2021-01-11 13:43:33 +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
|
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
|
ce0abd17fe
|
Debug v13
|
2021-01-02 16:18:16 +01:00 |
|
Laurent Destailleur
|
d65dc85a10
|
FIX for php 8
|
2020-12-23 19:16:25 +01:00 |
|
Laurent Destailleur
|
832db82fce
|
Fix warnings
|
2020-12-18 14:40:45 +01:00 |
|
Laurent Destailleur
|
5fe8c599d2
|
Fix warning
|
2020-12-16 00:28:57 +01:00 |
|
Laurent Destailleur
|
32741dd6f6
|
Fix warning
|
2020-12-15 10:51:35 +01:00 |
|
Laurent Destailleur
|
de37c0bff0
|
Fix Warning
|
2020-12-15 01:59:18 +01:00 |
|
Laurent Destailleur
|
b991badb8c
|
Fix warning
|
2020-12-14 13:03:43 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Laurent Destailleur
|
10bef6eb03
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/card.php
|
2020-12-04 19:24:29 +01:00 |
|
stickler-ci
|
ddf82f3e7a
|
Fixing style errors.
|
2020-12-04 14:45:26 +00:00 |
|
atm-benoit
|
b9461322d9
|
FIX SUPPLIER PROPOSAL v12 bug add
|
2020-12-04 15:37:00 +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
|
59b445a103
|
Clean dead code
|
2020-11-28 14:47:39 +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 |
|
Laurent Destailleur
|
3d2da45f84
|
Remove warning
|
2020-11-22 11:36:07 +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
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Laurent Destailleur
|
a9fbe9dd6c
|
Fix remove warning
|
2020-11-08 00:18:41 +01:00 |
|
Laurent Destailleur
|
83a7b19333
|
Look and feel v13
|
2020-11-02 11:41:07 +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
|
d122238439
|
Update supplier_proposal.class.php
|
2020-10-31 13:29:08 +01:00 |
|
Frédéric FRANCE
|
8190711342
|
doxygen
|
2020-10-30 18:01:01 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Francis Appels
|
93ab281d81
|
Fix tab indent
|
2020-10-26 18:21:47 +01:00 |
|
Francis Appels
|
3ff6f6a04a
|
Move phpcs enable to correct location @frederic34
|
2020-10-26 18:13:25 +01:00 |
|
Francis Appels
|
fa8e4a9bb0
|
No trigger for supplier proposal
|
2020-10-26 17:02:33 +01:00 |
|
Francis Appels
|
7fa7f0a390
|
Re-add set_date_livraison as a deprecated function.
Use correct naming convention for new method naming.
|
2020-10-26 16:50:52 +01:00 |
|
Laurent Destailleur
|
cd4d738a56
|
Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
|
2020-10-25 16:01:18 +01:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
7838ca32ba
|
Fix sql injection reported by Jason Nordenstam
|
2020-10-14 01:52:53 +02:00 |
|
AurelienBinard
|
39d538befc
|
Merge branch 'develop' into translateModLivraison2ModDelivery
|
2020-10-06 16:20:25 +02:00 |
|
Laurent Destailleur
|
e3542c6d4f
|
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
NEW Show category filter on lists only when user have rights to read categories
|
2020-10-06 12:29:10 +02:00 |
|
Aurélien
|
5571a166c6
|
change variable #14697
|
2020-10-06 11:37:55 +02:00 |
|