Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Tobias Sekan
1e13dbe270
fix non numeric error
2020-03-26 09:29:35 +01:00
Tobias Sekan
4624fd2445
Fix add mulitcurrency line in supplier proposal
2020-03-26 09:23:19 +01:00
Laurent Destailleur
62fefab5ac
Standardize color of status
2020-03-24 19:06:37 +01:00
Laurent Destailleur
1657a6b50a
FIX actions on supplier proposal not saved (bad trigger name)
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-03-24 15:00:13 +01:00
Laurent Destailleur
d922eb270d
FIX actions on supplier proposal not saved (bad trigger name)
2020-03-24 13:25:45 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46
Align color of graph of status on status color
2020-03-24 13:06:59 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Laurent Destailleur
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
Laurent Destailleur
39737c7c4b
Fix opacity on text with a href links inside
...
Fix var not defined
2019-12-22 13:19:14 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
630a150b09
Fix multicurrency rate must be visible if currency differs only
2019-11-03 17:48:16 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a25ec35fd4
clean indent
2019-10-27 12:22:57 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
104858cf47
Fix date selection on supplier proposal line not yet supported
2019-09-06 12:51:10 +02:00
Laurent Destailleur
e1ee70fd8f
Start to implement date selection of supplier proposals
2019-09-06 12:45:27 +02:00
Laurent Destailleur
05c9e97fe4
The deprecated method get_OutstandingBill has been removed. You can use
...
getOutstandingBills() instead.
2019-08-29 00:45:02 +02:00
Laurent Destailleur
d3b4a91f41
NEW Can enter price tax incl on vendor proposal and purchase orders
2019-07-05 20:24:22 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Laurent Destailleur
3007905508
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modProduct.class.php
htdocs/core/modules/modService.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/stripe/class/stripe.class.php
2019-04-30 03:30:40 +02:00
Laurent Destailleur
627ef14454
FIX The autocopy feature was ko for suppliers
2019-04-29 18:51:15 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
e6ffaeefe5
CSS
2019-04-17 10:39:30 +02:00
Laurent Destailleur
259235deae
Update card.php
2019-03-26 19:32:13 +01:00
Philippe GRAND
aeff3fc4f0
Merge remote-tracking branch 'upstream/develop' into develop
2019-03-25 14:45:00 +01:00
Philippe GRAND
e2e27dad37
translation
2019-03-25 14:42:44 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
930720decd
WIP Start to replace use of property ->brouillon
2019-03-21 18:13:51 +01:00
Laurent Destailleur
c0b6699b25
All methods set_draft() were renamed into setDraft()
2019-03-15 19:01:40 +01:00
Laurent Destailleur
eeafc3c630
Standardize translation of amount
2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Joan Louis
f326c75be7
Update call to extrafields from cards
2019-03-11 21:34:16 +01:00
Joan Louis
ee5753819e
Update call to extrafields from cards
2019-03-11 14:22:04 +01:00
Laurent Destailleur
3ec2338c2d
Look and feel v10
2019-02-26 19:37:32 +01:00
Frédéric FRANCE
452633e877
replace html code by html5 in supplier_proposal
2019-02-23 19:43:28 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
atm-greg
9d0e0c2798
FIX add fk_unit on addline action
2019-02-07 15:17:52 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
6de732d7f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
2019-02-01 16:05:43 +01:00
Laurent Destailleur
dee2a373c1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2019-02-01 16:01:18 +01:00
gauthier
caa937660d
FIX : wrong test enabled
2019-01-31 12:43:39 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Philippe GRAND
45abca9d14
update with html5 compliant code
2019-01-21 10:10:29 +01:00
Laurent Destailleur
5130019003
css
2019-01-17 19:27:26 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
ldestailleur
3af418349a
FIX Can't empty the payment mode
2018-12-29 07:54:30 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Frédéric FRANCE
42a9abad56
remove fieldlabel and add fieldeditkey
2018-10-27 17:45:29 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
e2f450aa8c
Fix regession losing description.
...
Rename updateligne into updateline.
2018-09-28 16:15:17 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
ksar-ksar
49d3bea192
Remove the test
...
After discussion with Frederic, the best solution is to remove the test
2018-08-30 11:27:48 +02:00
ksar-ksar
a844855ade
Update hook formConfirm
...
The hook should be called when the $formconfirm is not empty
2018-08-24 16:40:26 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
a8b33a1710
New fields desc_supplier on product_fourn_prices
2018-08-06 16:26:25 +02:00
Laurent Destailleur
7981bd08b7
Fix price+sql error when adding product when no supplier price defined
2018-06-16 14:47:33 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Frédéric FRANCE
812b182680
loadlangs
2018-05-26 17:04:23 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
3340598cf8
FIX Projet is not prefilled when created from overwiew page
2018-05-01 14:15:11 +02:00
Laurent Destailleur
5eb7c7ffff
FIX Edit of ref_supplier in supplier invoice
2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87
NEW Can add product in supplier order/invoice even w/o predefined price
...
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
2018-04-24 12:57:31 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
Regis Houssin
ea175cd6c1
Fix: compatibility with multicompany dictionnary sharing
2018-03-09 09:37:23 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Marc de Lima Lucio
6a4a3c9e82
NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL
2018-03-05 10:58:19 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency
2018-02-26 09:54:09 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
KHELIFA
54dba24ab5
Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-02-23 11:06:07 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
a4f2a2532d
FIX: supplier credit notes: use MAIN_FEATURES_LEVEL
2018-02-20 11:41:57 +01:00
Marc de Lima Lucio
924a9c392c
FIX: supplier credit notes: hide relative discounts until supported
2018-02-16 12:30:32 +01:00
Marc de Lima Lucio
d2bb6a790b
NEW: supplier credit notes: display supplier discounts in supplier proposal card
2018-02-16 11:45:57 +01:00
Laurent Destailleur
f1305bbdd6
Fix css
2017-12-20 21:14:22 +01:00
Laurent Destailleur
1251807f54
Fix several pb in links to projects on create page
2017-12-12 10:37:51 +01:00
Laurent Destailleur
bf121f9b3c
Work on saving supplier_ref into database lines
2017-11-12 19:29:03 +01:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
9d6498f2a4
NEW Search filters in lists are restored when using "back to list"
2017-10-03 14:50:52 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
fc7d27c75c
Fix bad constant
2017-09-17 17:19:18 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +02:00
Laurent Destailleur
7aa09d8b71
NEW Can create thirdparty from card proposal, order or invoice
2017-08-28 18:37:16 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Laurent Destailleur
4da49dfc2d
FIX #7239
2017-08-23 15:02:38 +02:00
Laurent Destailleur
e5513cff91
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2017-07-15 21:24:21 +02:00
Laurent Destailleur
4e45c7fdba
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-15 21:21:40 +02:00
Laurent Destailleur
028f1f5133
Fix default currency in creation form.
2017-07-13 10:16:40 +02:00
arnaud
1a71e9b4a0
FIX add supplierproposaldet without price (new product)
2017-07-05 16:57:03 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
693b2fe3b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
2017-06-23 11:20:29 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Laurent Destailleur
6d42922839
FIX #7012
2017-06-20 10:37:42 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
phf
f2961b8652
Fix 6993 - supplier propal check min price on update line
2017-06-13 12:30:30 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
919d5b2ef3
Fix missing translation
2017-05-05 14:01:32 +02:00
Laurent Destailleur
0bffac6dc4
Use constant vor status.
2017-05-05 13:43:43 +02:00
Laurent Destailleur
de356a3185
Revert "FIX : close supplier makes no sense. we just need to know if it is ac…"
2017-05-05 12:41:31 +02:00
Laurent Destailleur
e6ad3ea7d4
Merge pull request #6773 from atm-gauthier/FIX_useless_close_button
...
FIX : close supplier makes no sense. we just need to know if it is ac…
2017-05-05 12:34:52 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
gauthier
551d79f1e2
FIX : close supplier makes no sense. we just need to know if it is accepted or not
2017-04-11 17:36:21 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Marcos García de La Fuente
a8da077613
FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key
...
Close #6613
2017-04-09 14:13:04 +02:00
BENKE Charlie
68656dd29c
FIX : supplier default condition not retrived on create
2017-03-26 01:49:13 +01:00
BENKE Charlie
1cc8671433
FIX : supplier default condition not retrived on create
2017-03-25 12:06:02 +01:00