Laurent Destailleur
f0802eb36b
FIX #4245 PHP 7
2015-12-19 19:48:36 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Sof
011f0fbb0b
FIX : Typo error
2015-12-15 14:04:52 +01:00
Laurent Destailleur
84ee18a11b
Fix bad management of second level approvement
2015-12-14 10:33:18 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
b47dbc7a5f
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Marcos García
a30f7d543a
Corrected fix
2015-11-25 10:19:11 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
e8fc5f0d3a
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
2015-11-21 11:00:56 +01:00
Laurent Destailleur
835700bb25
Merge pull request #4006 from marcosgdf/bug-3989
...
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0
Merge pull request #4005 from marcosgdf/bug-3988
...
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 23:42:04 +01:00
Alexis Algoud
55b23c4918
FIX add billed field in supplier order
2015-11-16 14:55:46 +01:00
Marcos García de La Fuente
53fb085766
Corrected indent
2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 13:20:56 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
frederic34
7349862b64
translations
2015-11-07 11:19:31 +01:00
frederic34
a597d6c379
allow chaining
2015-11-07 10:23:56 +01:00
frederic34
becce332dd
allow chaining and remove header exit
2015-11-07 09:52:00 +01:00
Laurent Destailleur
e26940ddf7
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
Laurent Destailleur
df4f09e72f
FIX #3240
2015-11-03 14:02:36 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Frédéric FRANCE
4689b0cc11
Update fournisseur.commande.class.php
2015-10-21 17:31:51 +02:00
Laurent Destailleur
81580f75b9
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Frédéric FRANCE
d68db2a844
Update fournisseur.commande.class.php
2015-10-17 08:48:53 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
1f742c7464
FIX Add a test to save life when ref of object (invoice ref, order ref,
...
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
2015-10-06 16:38:27 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
Marcos García de La Fuente
c58b5a5117
Created CommandeFournisseur::hasDelay function
2015-09-06 19:23:46 +02:00
Laurent Destailleur
fcc6ce8c31
Fix Option for second level approbation was visible when it should
...
not.
2015-07-29 15:39:34 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Francis Appels
28e973331b
Fix: update supplier orderline + rm deprecated prop
...
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
2015-05-18 18:42:14 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
7be7a770c1
Implemented units for CommandeFournisseur and FactureFournisseur
2015-04-19 16:46:24 +02:00
Laurent Destailleur
9dd73de9b0
Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Francis Appels
c5599efe62
Don't show 'undifined' when no max delivery time
2015-04-18 18:56:25 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
d76c1a9f42
Can filter on serial number into movement list
2015-04-10 12:59:33 +02:00
Laurent Destailleur
e01e0faeef
Can reopen to edit supplier order once ordered
2015-04-09 16:15:52 +02:00
Laurent Destailleur
ed6f2e9386
Fix error management
2015-04-09 15:14:50 +02:00
Laurent Destailleur
e2508287bd
Merge pull request #2537 from marcosgdf/cq
...
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-06 12:37:52 +02:00
Laurent Destailleur
f38bf5a7d2
Fix extrafields were not saved when creating a supplier order
...
Fix removed hooks where we must use trigger
2015-04-03 11:00:52 +02:00
Marcos García de La Fuente
6fe803cd86
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-03 05:18:47 +02:00
Laurent Destailleur
cf0f458a51
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
htdocs/langs/el_GR/projects.lang
htdocs/langs/en_GB/bills.lang
htdocs/langs/en_GB/main.lang
htdocs/langs/en_GB/orders.lang
htdocs/langs/es_AR/bills.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/main.lang
htdocs/langs/es_ES/bills.lang
htdocs/langs/es_ES/projects.lang
htdocs/langs/fa_IR/categories.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/other.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/nb_NO/bills.lang
htdocs/langs/pl_PL/bills.lang
htdocs/langs/pl_PL/mails.lang
htdocs/langs/pl_PL/projects.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/products.lang
htdocs/langs/ro_RO/projects.lang
htdocs/langs/ru_RU/bills.lang
htdocs/langs/ru_RU/projects.lang
htdocs/langs/sl_SI/main.lang
htdocs/langs/tr_TR/bills.lang
htdocs/langs/tr_TR/projects.lang
htdocs/langs/vi_VN/bills.lang
2015-04-02 13:57:20 +02:00
