Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
81130634d3
[CORE] intégration de incoterm sur les différentes class (#incoterm).
2015-02-23 09:16:14 +01:00
Laurent Destailleur
b04682db4c
Fix Edit of extrafield on supplier invoice or order was deleteing other
...
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
2015-02-22 17:41:02 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
Laurent Destailleur
d7dcf28c61
Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into
...
atm-gauthier-3.7
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-02-18 23:15:40 +01:00
Laurent Destailleur
b6947dbe2c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
2015-02-18 22:04:26 +01:00
Laurent Destailleur
1e1543403b
New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set
...
user approving as contact following supplier order.
2015-02-17 19:49:17 +01:00
Laurent Destailleur
ad67fe50a3
Correct management when delivery date is universal time format.
2015-02-17 17:21:41 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Gauthier
105e024c48
@param desc
2015-02-12 13:20:03 +01:00
Gauthier
be56f76743
FIX : Display error on dispatched quantity when we have several times same product in a supplier order
2015-02-12 12:56:21 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
Laurent Destailleur
fb3cf4da1e
New: The comment of the stock movement when making a supplier order
...
receiving is also stored into the tracking dispatch table (not only into
stock movement table).
2015-02-11 15:03:33 +01:00
Laurent Destailleur
b9d2de99e1
Translation
2015-02-11 14:46:16 +01:00
phf
a1d2f426b8
[CORE] correction mineurs pour travis (#new_ask_price).
2015-02-09 10:17:28 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +01:00
Laurent Destailleur
3f807a09b4
Doxygen
2015-02-08 00:39:51 +01:00
phf
1d9a3e0ce2
[CORE] Fix : renommage d'une fonction (#deliverytime).
2015-02-06 16:39:54 +01:00
phf
12c7e52b7e
[CORE] Fix : rename de la variable "delai_livraison_jours" en "delivery_time_days" (#deliverytime).
2015-02-06 16:33:58 +01:00
phf
35d41d6f7c
[CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime).
2015-02-06 16:07:22 +01:00
phf
296fae058c
[CORE] ajout de la liaison entre une demande de prix et une commande fournisseur (#new_ask_price).
2015-02-03 16:54:04 +01:00
phf
1e71b01016
[CORE] ajout d'une fonction pour mettre à jour l'id de projet lors de la création d'une commande depuis la demande de prix (#new_ask_price).
2015-02-03 15:22:03 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
41e01a22a3
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
2015-01-17 18:58:05 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Laurent Destailleur
38ba6ac75b
Fixed: pgsql to make order
2014-12-18 11:48:30 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
28c0c55780
Merge pull request #1977 from atm-maxime/develop
...
Add : statistics on supplier orders and invoices on home page
2014-10-30 17:59:07 +01:00
Laurent Destailleur
6f77dc83c4
Qual: Uniformize code and fix a ton of bugs.
2014-10-27 03:24:45 +01:00
MAxime Kohlhaas
3a626d8503
Add : statistics on supplier orders and invoices on home page
2014-10-25 17:22:03 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
c30f13a03d
Fix: label of input method not translated.
2014-10-12 02:07:50 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
016c889aa8
Refactored CommandeFournisseur::generateDocument and FactureFournisseur::generateDocument
2014-09-22 00:15:32 +02:00
Raphaël Doursenaud
c7c809a609
FIX: Wrong type hinting
2014-09-19 03:05:20 +02:00
