Laurent Destailleur
03cc1bd039
Fixed bad sql error
2015-01-31 00:27:35 +01:00
Laurent Destailleur
a35bd9a3e4
Fixed bad sql request
2015-01-31 00:27:11 +01:00
Laurent Destailleur
2684b327e5
Fixed bad sql error
2015-01-31 00:23:10 +01:00
Laurent Destailleur
29d399ba79
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 00:09:37 +01:00
Laurent Destailleur
0ea4a5db7d
Fixed: Error management on triggers
2015-01-31 00:08:45 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
phf
d2cd78884e
[CORE] ajout de code nécessaire pour le fonctionnement du module pour créer une code fournisseur depuis une demande validé et accépté (#new_ask_price).
2015-01-30 16:52:14 +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
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +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
phf
3b0fd5ec98
[CORE] modification légère, début de redirection pour créer une commande fournisseur si la demande est accépté (#new_ask_price).
2015-01-29 17:36:12 +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
76bf95789d
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-24 21:51:33 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
Laurent Destailleur
267ba24820
Generalize option PROJECT_SHOW_REF_INTO_LISTS
2015-01-24 21:41:40 +01:00
jean
b809f0aeb8
Merge remote-tracking branch 'origin/3.6' into 3.6
2015-01-20 17:31:17 +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
KreizIT
a9008c4993
Fix Creating default object from empty on supplier order confirmation
2015-01-15 17:40:15 +01:00
Cedric
999a6052ff
FIX : Creating default object from empty when validating supplier order
2015-01-15 16:23:10 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
aec1bdb3c4
Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice
2014-12-25 23:08:07 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
b681885542
Fixed: Bad url link
2014-12-10 21:14:59 +01:00
Laurent Destailleur
ef4bdcdb2a
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-30 15:43:04 +01:00
Laurent Destailleur
e395fd8096
Fix CRLF
2014-11-30 15:24:39 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Marcos García de La Fuente
5cc015268e
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-28 01:02:59 +01:00
Laurent Destailleur
806719b562
Merge pull request #2089 from marcosgdf/bug-1718
...
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-28 00:37:56 +01:00
Laurent Destailleur
232921a506
Fixed: Add option on a not common new feature
2014-11-28 00:34:03 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Marcos García de La Fuente
082f67a6e4
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-24 12:49:33 +01:00
Frédéric FRANCE
afc87f5445
Update /fourn/commande/list.php
2014-11-23 17:45:07 +01:00
Frédéric FRANCE
018d1488fc
Update /fourn/commande/list.php
2014-11-23 10:03:03 +01:00
aspangaro
acbbe823e8
Typo
2014-11-06 20:04:51 +01:00
aspangaro
b60f834d8d
Improve search into supplier command list
2014-11-06 07:19:16 +01:00
Laurent Destailleur
5086450f35
Fix: Forging email content must use dol_concatdesc.
2014-11-02 12:32:38 +01:00
Ion Agorria
82aa8458bf
Added ws url/key to thirdparty SQL table, class and info page
2014-10-31 17:46:11 +01:00
Ion Agorria
557cbaf3d7
Added module descriptor and activation checks
...
Corrected 3 missing $error_occurred flags
2014-10-31 04:59:57 +01:00
Ion Agorria
e875f0c2b8
Fixed missing separator
2014-10-29 05:33:59 +01:00
Ion Agorria
4ff570571e
Added SOAP client for creating a client order in remote
...
webservice that thirdparty might have.
2014-10-29 05:13:15 +01:00
Laurent Destailleur
132ddf65d6
Fix: several bugs into document generation (default must be used in
...
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
2014-10-27 19:37:30 +01:00
jean
619bcb44df
object must be reloaded before creating pdf on confirmation and ordering
2014-10-21 19:02:48 +02:00
Maxime Kohlhaas
ee4b807a5d
Qual : refactoring extrafields display on objects into a single tpl file
2014-10-14 17:00:06 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Laurent Destailleur
11d1be882c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/list.php
2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Florian HENRY
46f673fb5f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fourn/card.php
2014-09-29 16:01:49 +02:00
Laurent Destailleur
ba33f73767
Merge pull request #1925 from tiaris/develop
...
adding hooks for supplier card and order card
2014-09-29 15:40:31 +02:00
Florian HENRY
ce145cc056
Add cache excel export on harddrive with
...
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
2014-09-29 10:16:48 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
722e939e19
Fix: form must not be into a closing and opening tr tag.
2014-09-26 13:23:54 +02:00
Florian HENRY
3bc227b467
Fix for travis syntax
2014-09-25 10:25:15 +02:00
jean
e9374e8c08
adding hook for addMoreActionsbuttons
2014-09-25 09:26:32 +02:00
Laurent Destailleur
396bae21d6
Fix: Missing closing tr
2014-09-24 18:15:20 +02:00
Florian HENRY
518d23f278
Add feature to order to invoice on supplier part
2014-09-23 16:28:29 +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
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Marcos García de La Fuente
9ae7486555
Removed deprecated usage of supplier_order_pdf_create and supplier_invoice_pdf_create
2014-09-16 21:42:07 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Marcos García de La Fuente
949ae2f160
[ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
2014-09-14 13:09:31 +02:00
Cubexed
00856eb277
Merge remote-tracking branch 'upstream/develop' into develop
2014-08-26 17:29:42 +02:00
Laurent Destailleur
bc0c5fb55e
New: Can modify order with status approved if it was not sent yet to
...
supplier.
2014-08-21 14:24:06 +02:00
Cubexed
ecd90ddbff
Enables the fetching and saving of start and end dates in supplier order lines.
2014-08-18 23:02:04 +02:00
Laurent Léonard
0228cd9db7
Fix translations in e-mail forms
2014-07-28 02:45:58 +02:00
Juanjo Menent
acaca341ab
Fix: [ bug #1521 ] The second order's page from a provider shows all
...
orders
Conflicts:
ChangeLog
2014-07-21 17:00:59 +02:00
Juanjo Menent
8cd2e00e5f
Fix: [ bug #1521 ] The second order's page from a provider shows all
...
orders
2014-07-21 16:57:08 +02:00
Laurent Destailleur
dec7fe42af
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/commande/fiche.php
2014-07-20 15:37:50 +02:00
Laurent Destailleur
bf926cd791
Merge pull request #1756 from marcosgdf/messages
...
Migrated old message notifications to the """new""" system
2014-07-20 04:57:09 +02:00
Laurent Destailleur
5be7e75fe6
Merge pull request #1752 from marcosgdf/doactions-supplier
...
Added missing doActions for supplier order fiche.php
2014-07-20 04:49:27 +02:00
Laurent Destailleur
8137fd7fe4
Fix: Type of line (product/service) could not be edited on supplier
...
order/invoice.
2014-07-20 02:36:03 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Laurent Destailleur
b42a33b203
Fix: For contract, only services available by default. Product appears
...
if option is set only.
2014-07-19 21:14:56 +02:00
Marcos García de La Fuente
63585ea9ca
Added missing doActions for supplier order fiche.php
2014-07-18 01:32:54 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
KreizIT
5e7c0639b0
Refactor: various trigger
2014-07-11 16:02:27 +02:00
frederic34
387d36e4b0
Ste bank account for supplier order
2014-07-09 18:00:21 +02:00
Juanjo Menent
8e4e08f907
[ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu
2014-07-04 16:48:42 +02:00
Laurent Destailleur
e496823778
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
ChangeLog
htdocs/fourn/commande/fiche.php
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
htdocs/product/stock/replenish.php
2014-07-04 14:14:40 +02:00
Juanjo Menent
c7e20c9a80
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with
...
Suppliers
2014-07-04 10:25:05 +02:00
Juanjo Menent
47cff4d407
Fix: Unable to add lines in supplier orders
2014-07-04 10:04:30 +02:00
Laurent Destailleur
2c493a4fe3
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Laurent Destailleur
a2f610ffbe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Laurent Destailleur
0b38fcb830
Merge pull request #1604 from atm-alexis/develop_add_delivery_column_on_supplier_order
...
Develop - add delivery column on supplier order
2014-06-26 21:13:20 +02:00
Laurent Destailleur
018e1d31e3
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/class/product.class.php
htdocs/projet/class/project.class.php
2014-06-25 20:22:25 +02:00
Cedric
00779dd8fa
FIX #1460 , #1461
2014-06-24 10:53:18 +02:00
Laurent Destailleur
b4add020a9
Fix: Question about warehouse must not be done when module stock is
...
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
2014-06-23 11:47:07 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Laurent Destailleur
28fd8c6862
Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top
...
margin.
2014-06-20 14:04:37 +02:00
Florian HENRY
40f5911f52
Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a
...
product (on supplier order part)
2014-06-20 09:36:31 +02:00
Florian HENRY
9bb537f399
- New: If multilangue is enabled, mail (from propal, invoice, etc...)
...
message is pre-defaulted in Customer language
2014-06-18 09:59:15 +02:00
Laurent Destailleur
8d8ca154f1
Fix: For supplier order/invoice, deselect product when free line is
...
selected.
2014-06-09 14:58:58 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Marcos García de La Fuente
603c28dcdd
[ bug #1397 ] Filter by supplier orders with status Draft does not filter
2014-05-23 02:04:02 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Alexis Algoud
45067c63d8
Add delivery date into supplier order list
2014-05-15 11:37:40 +02:00
Laurent Destailleur
b3b7da8f08
Merge pull request #1595 from FHenry/develop
...
Add showempty into combobox
2014-05-14 11:46:35 +02:00
Laurent Destailleur
4a347236ee
Merge pull request #1594 from atm-alexis/develop
...
Add detailled view in supplier order as in customer order
2014-05-14 11:40:49 +02:00
Florian HENRY
eb8eca5f9d
Suplier Order, do not insert line if error with missing fields
2014-05-14 10:55:27 +02:00
Laurent Destailleur
7ecfd4c243
Fix: seller and buyer inverted when using suppliers orders and
...
invoices.
2014-05-13 13:55:08 +02:00
Alexis Algoud
197ff1a653
Add detailled view in supplier order as in customer order
2014-05-12 12:10:53 +02:00
Alexis Algoud
f13c146908
Fix page numerotation as in company list
2014-05-12 11:00:58 +02:00
Laurent Destailleur
131f133e07
New: Merge free product and predefined product area to enter new
...
product (Supplier orders now use same template than customer
orders/proposal/invoices).
2014-05-05 17:59:43 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Raphaël Doursenaud
6d7728d9bf
Regenerate document on supplier orders steps
2014-04-02 15:37:19 +02:00
Laurent Destailleur
9a8a306d78
Qual: Method form->select_currency() has been removed. Use instead
...
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64
New: Can filter on status for supplier order.
2014-04-02 12:48:34 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Alexis Algoud
f97c8feb54
fix can't add line with product in supplier order
2014-03-26 11:28:41 +01:00
Florian Henry
cf9b194008
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-21 15:08:30 +01:00
Florian Henry
f0882eca2d
Add ref supplier as column and clear varialbes in double
2014-03-21 15:01:40 +01:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Gauthier
eb43bc4982
Correction when adding line with price as '0'
2014-03-17 15:38:12 +01:00
Laurent Destailleur
b1498c584d
Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into
...
KreizIT-dluo_step5
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-16 20:49:56 +01:00
KreizIT
9be2bb0e60
Travis Fix
2014-03-16 07:00:27 +01:00
KreizIT
3782742aad
- add batch management on supplier dispatch product
...
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
2014-03-15 10:28:01 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
ea773531b5
Fix: [ bug #1206 ] PMP price is bad calculated
2014-03-01 14:49:30 +01:00
Laurent Destailleur
b64a2b2718
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
74404749c6
Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a
2014-02-28 16:00:57 +01:00
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +01:00
geoffrey.girard
efa7a16c07
Add hook printObjectLine supplier order and supplier invoice
2014-02-04 17:30:48 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
9e5e74cb58
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/fourn/commande/fiche.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/languages.lang
htdocs/langs/es_ES/main.lang
2013-12-19 21:03:15 +01:00
Geoffrey
1942b4a476
add extrafields support in supplier orders. managed in configuration but not in view mode
2013-12-17 16:15:48 +01:00
Geoffrey
dce354adc3
add extrafields support in supplier orders. managed in configuration but not in view mode
2013-12-16 11:13:39 +01:00
Laurent Destailleur
a05d9b864a
Fix: Test must never be done on a translated string
2013-12-08 16:40:45 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
395066519b
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
2013-12-01 16:18:18 +01:00
Laurent Destailleur
bdf8100d84
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/product/stats/commande_fournisseur.php
2013-11-28 15:54:12 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Laurent Destailleur
48570f599a
Fix: form is not allowed into a table. This break some javascript and
...
make some browsers crazy.
2013-11-17 23:25:25 +01:00
simnandez
b9c8852471
Qual: Improve suppliers orders manual receivings
2013-11-14 17:08:59 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1
factorization
2013-11-06 10:20:54 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Grand Philippe
a14de0c035
fix : language
2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Cédric Salvador
fc136d0d06
changed parameter
2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
305c1d63a7
Qual: Uniformize code. No useless redirect. use GETPOST.
2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828
Fixed typos
2013-09-05 18:06:51 +02:00
Florian Henry
3cf3dbeb51
Add pdf link into supplier invoice list and supplier order list
2013-08-09 13:48:44 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Maxime Kohlhaas
5a38a43c87
Task # 1011 : now supplier order and invoice deal with payment terms and mode
2013-07-30 16:21:39 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Florian Henry
e82b8e9b9e
Fix [ bug #990 ] Filter + sort does not work on order list
2013-07-26 12:16:39 +02:00
Laurent Destailleur
bf9b255c92
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Laurent Destailleur
b5820315f9
Fix: Correct permissions on files
2013-07-13 10:34:19 +02:00
Laurent Destailleur
548ea4f93f
Fix: Navigation
2013-07-10 23:58:49 +02:00
Laurent Destailleur
c98545010b
Fix: Navigation
2013-07-10 23:57:18 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Marcos García
3b28de0a07
Fixed some translation problems
2013-06-08 21:57:57 +02:00
Cédric Salvador
37ef86379f
fixed bug when editing a supplier order line
2013-06-05 18:19:50 +02:00
Laurent Destailleur
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
Marcos García
5b248805c2
Notifications popup messages were not showing real notifications that were going to be sent
2013-04-21 14:24:19 +02:00
Raphaël Doursenaud
e1a3d46ea0
Fixed for new API for note update
2013-04-20 06:43:13 +02:00
Laurent Destailleur
d3f29649d5
Fix into div/br
2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a
Look: Optimize screens
2013-04-16 01:13:20 +02:00
Laurent Destailleur
ae01285fe9
Look: Replace table with div.
...
Look: Optimize for smartphone
2013-04-12 16:16:39 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Laurent Destailleur
e0baa0fe46
Generalize fix: file with a specific mask not found, again
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/expedition/fiche.php
htdocs/fichinter/fiche.php
2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba
Generalize fix: file with a specific mask not found, again
2013-03-30 13:54:46 +01:00
Maxime Kohlhaas
83def2cd57
Fix : on a new trigger, using $this but not in a class...
2013-03-25 18:03:42 +01:00
Laurent Destailleur
4e029bf2ca
Fix: Security does not need special case
2013-03-24 21:06:45 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
simnandez
8114249fca
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
...
Supplier order
2013-03-12 15:06:38 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Laurent Destailleur
51d23d7c48
Merge fix of 3.3
2013-03-02 16:17:12 +01:00
Laurent Destailleur
81a06507fa
Fix: data not refreshed
2013-03-02 16:01:46 +01:00
Maxime Kohlhaas
cd5bda27f4
Supplier dispatch : add new trigger called after order is dispatched
2013-02-25 16:56:37 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Laurent Destailleur
3eb485d521
Qual: Removed TODO, deprecated code and deprecated properties. This also
...
fix missing combo box of contacts onto CC.
2013-02-12 17:08:21 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Regis Houssin
9868880142
Fix: missing files library
2013-01-23 11:29:58 +01:00
Regis Houssin
c66c02e745
Fix: missing files library
2013-01-23 11:28:11 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
142f171e50
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/.gitignore
2013-01-08 11:10:47 +01:00
Laurent Destailleur
091e469050
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
...
e-mail
2013-01-07 00:40:18 +01:00
Laurent Destailleur
5f99488c99
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/langs/es_ES/admin.lang
2013-01-05 16:41:08 +01:00
simnandez
c639d80372
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-05 09:47:54 +01:00
simnandez
32b19802b1
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-05 09:43:40 +01:00
Laurent Destailleur
4fe1ba33f9
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
2012-12-30 18:00:07 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694
Fix: change for a neutral email
2012-12-30 15:11:07 +01:00
Marcos García
0c113d33a6
Removed unuseful code
...
Some lines may be marked as changed but they are not because of incorrect line endings
2012-12-29 13:12:45 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
4abae05c26
Qual: Uniformize behaviour of product selection
2012-11-26 13:37:40 +01:00
Laurent Destailleur
80c252dd62
Fix: Use same labels to go back to draft than other elements.
...
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
2012-11-03 21:33:55 +01:00
Regis Houssin
d0dc336a85
New: jQuery and jQuery UI upgrade
...
New: jQuery Timepicker addon for Datepicker
2012-11-03 19:15:45 +01:00
Regis Houssin
9d95e8bffb
Fix: missing hookmanager
2012-10-25 11:44:04 +02:00
Regis Houssin
446a81b4c4
Fix: move class in template
2012-10-18 10:35:55 +02:00
Laurent Destailleur
8ff506b120
Sec: Sanitize all params page, sortfield and sortorder
2012-10-13 14:47:46 +02:00
Maxime Kohlhaas
ed2a140046
Task # 559 : add display of discount in product list while adding line on supplier order
2012-10-01 11:45:28 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
Laurent Destailleur
2c2d17b101
Fix: Try a fix to avoid having the hover on array that should not have
...
it.
2012-09-09 13:13:24 +02:00
Marcos García
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Regis Houssin
6fe631378b
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline
2012-08-25 11:28:08 +02:00
Regis Houssin
c9113458d9
New: [ task #498 ] part 3
2012-08-25 03:28:30 +02:00
Marcos García
082753d115
Refactored code
2012-08-24 19:55:31 +02:00
Marcos García
977571e032
Forgot to apply the patch to the rest of the files
2012-08-24 18:32:19 +02:00
Marcos García
0ecfe0465e
Fixed bug #499
...
The input method of supplier orders wasn't being translated
2012-08-23 09:20:30 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2
Lower-cased all <?PHP
2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Regis Houssin
577a853b9b
New: update field "qty" with minimum qty for this supplier price
2012-08-17 18:17:15 +02:00
Regis Houssin
7394525388
Fix: disable "add" button and show error message if a product with no
...
supplier price is selected
2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169
FIXME: with ajax autocompleter, does not see the products that have no
...
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Regis Houssin
4825448ced
Merge pull request #315 from marcosgdf/error-messages
...
Forgot to migrate to some lines to the new error-handler
2012-08-16 13:59:05 -07:00
Marcos García
29f2e7236a
Forgot to migrate to some lines to the new error-handler
2012-08-16 21:37:33 +02:00
Regis Houssin
7a30416124
Merge pull request #310 from marcosgdf/error-messages
...
Added missing error messages in supplier & customer's orders
2012-08-16 08:16:56 -07:00
Marcos García
db5d046ee7
Applied 3.3 error management as @hregis requested
2012-08-16 13:10:14 +02:00
Marcos García
3941466cd3
Removed duplicated code
2012-08-16 03:55:41 +02:00
Marcos García
b4471a4bd7
Added missing error messages in supplier & customer's orders
2012-08-15 15:52:51 +02:00
Stephen L
c1d15a9572
Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches)
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-14 15:50:45 +02:00
Laurent Destailleur
2f0a88ce69
[ bug #480 ] Can't receive to stock with strict mode
2012-08-07 19:32:51 +02:00
Regis Houssin
28851b46c4
Fix: remove duplicate code
2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74
Fix: replace with new event message system
2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95
Fix: broken event message
2012-07-29 15:47:24 +02:00
Regis Houssin
eee5653c54
Fix: try to use the new message system
2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61
Fix: try another method more clean and can be deployed on any type of
...
message
2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3
Merge pull request #272 from marcosgdf/backtolist-links
...
Created BackToList links
2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10
Fix: try to use another method for messages
2012-07-28 22:07:27 +02:00
Marcos García
90963ca84a
BackToList links in Client orders section
2012-07-28 20:54:07 +02:00
Marcos García
472397d5c2
BackToList links in Supplier order section
2012-07-28 20:47:12 +02:00
Marcos García
a6c8838b8f
Applied patches 9-15
2012-07-27 21:27:03 +02:00
Regis Houssin
d5ff308992
Fix: declare $mesg and $mesgs in main.inc.php
...
Fix: strict mode be back
2012-07-23 20:52:55 +02:00
Regis Houssin
77b9718473
Fix: strict mode street
2012-07-13 10:15:47 +02:00
Regis Houssin
e1b0d183e4
Fix: add commonorder and commoninvoice classes
2012-07-11 18:13:41 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Regis Houssin
bf379fc242
Fix: uniformize code
2012-06-11 21:45:59 +02:00
Regis Houssin
274734b828
Fix: stock message in session and reload the page for avoid url problem
...
with jQuery fileupload
2012-05-31 21:11:26 +02:00
Laurent Destailleur
c2db3265ec
Fix: Regression with quot management. Try a better fix.
2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac
Fix: can't delete a files with quote
2012-05-30 08:30:25 +02:00
Laurent Destailleur
3fc3292142
Fix: delete of documents is done by page of element, not by the view
...
wrapper.
2012-05-29 23:50:13 +02:00
Regis Houssin
516be43404
Fix: jquery fileupload broken feature
2012-05-25 20:56:05 +02:00
Regis Houssin
9cf2ea492c
Fix: broken features with external module
2012-05-21 18:44:09 +02:00
juanjo
a6b0242f8a
[ task #407 ] Manage PDF hidden items
2012-05-21 17:12:57 +02:00
simnandez
d226534ba0
Fix:[ bug #399 ] Bad calculation of local taxes in update line products
2012-05-09 12:12:14 +02:00
Laurent Destailleur
161846be77
Fix: [ bug #397 ] Product VAT is not coming from buying price
2012-05-08 22:10:07 +02:00
Laurent Destailleur
66531ea539
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/fourn/commande/index.php
2012-04-16 12:03:33 +02:00
Regis Houssin
6c3e88e43a
Fix: missing field change name
2012-04-16 11:52:27 +02:00
Laurent Destailleur
48542b8625
Fix: Must use tms date
2012-04-16 11:39:26 +02:00
Grand Philippe
980fa86857
uniformise code and fix rights
2012-04-13 14:02:53 +02:00
Grand Philippe
c8dd3b4801
to add delivery date
2012-04-10 17:21:28 +02:00
Laurent Destailleur
4e65d12a0f
Fix: The draft view must be at same place for all pages. We will have to
...
discuss to move all or not later.
2012-04-04 17:43:32 +02:00
Vinicius Nogueira
4110f250a7
New: Box Status and Box Drafts changed position
...
Show all Status and give the possibility to filter only one, and Drafts
position of the box changed to a better visualization
2012-04-03 17:26:40 +08:00
Laurent Destailleur
daf2a19396
New: Add signature at end of predefined email text
2012-03-28 00:56:12 +02:00
Laurent Destailleur
78ae7dc075
Checkstyle
2012-03-27 09:59:28 +02:00
Regis Houssin
ffc6812241
Fix: avoid php strict mode warning
2012-03-23 18:19:50 +01:00
Laurent Destailleur
0fd372e5da
Trans: Update language files
...
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
2012-03-22 23:52:02 +01:00
Regis Houssin
808c4b5732
New: testing a new method to avoid reloading the page
2012-03-18 14:06:55 +01:00
Regis Houssin
d752e25946
New: add new notes system in contract and order/invoice supplier module
2012-03-18 11:13:01 +01:00
Laurent Destailleur
a7a55645d8
Fix: Some fix when using fckeditor with notes.
...
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
2012-03-18 00:59:24 +01:00
Laurent Destailleur
245edb8596
Fix: Maxi debug on sending document by email. Works now with odt too.
2012-03-16 00:34:41 +01:00
Regis Houssin
8dc8297afe
Fix: missing tva rates of supplier
2012-03-15 09:19:38 +01:00
Regis Houssin
f8bf7ade83
Fix: move method in common class
2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3
Fix: move method in common class
2012-03-13 19:24:11 +01:00
Laurent Destailleur
b5fc41fadc
Fix: Removed a lot of checkstyle warnings
2012-03-11 22:08:46 +01:00
FHenry
7b5c9de555
.
2012-03-08 05:15:15 +08:00
FHenry
aba929ed69
hook parameters on select product
2012-03-08 05:15:01 +08:00
Regis Houssin
9301def08d
Fix: rename method
2012-03-02 15:03:14 +01:00
Regis Houssin
addc8db9e7
Fix: rename hooks
2012-03-01 16:51:59 +01:00
FHenry
16408b6310
Merge remote branch 'origin/develop' into develop
2012-02-29 14:32:33 +01:00
FHenry
59f424bde3
add hook for select produit
2012-02-29 14:32:22 +01:00
Laurent Destailleur
1645ddbe47
Sec: Sanitize all input for ids.
2012-02-27 22:26:22 +01:00
Laurent Destailleur
24422afe44
Better fix
2012-02-26 02:54:16 +01:00
Laurent Destailleur
de187ab398
Try a better fix
2012-02-25 16:14:41 +01:00
Regis Houssin
19f53e6caa
Fix: default customer language problem
2012-02-25 11:10:38 +01:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Regis Houssin
cd3452d71d
Fix: multicompany sharings and uniformize code
2012-02-11 10:18:09 +01:00
Laurent Destailleur
be4d04ebcc
Fix: Default language set to language of thirdparty
2012-02-01 21:04:49 +01:00
Regis Houssin
c6e4206907
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4
Fix: use entity field of object
2012-02-01 11:32:55 +01:00
Laurent Destailleur
f3a966a313
Fix: Missing name
2012-01-29 23:24:47 +01:00
Laurent Destailleur
08e33f20dc
Qual: Uniformize code
...
Doxygen
2012-01-19 09:53:27 +01:00
Regis Houssin
4eb88be3b6
Fix: bad rights
2012-01-09 11:28:37 +01:00
Regis Houssin
85d7285519
[bug #275 ] Ajout contacts - choix par "par défaut" de l'entreprise du
...
fournisseur
Fix: uniform code
2012-01-09 11:12:07 +01:00
Laurent Destailleur
c2348ef600
Uniformize field country_id, country_code, country
2011-12-29 18:07:41 +01:00
Laurent Destailleur
43964552bf
Add a TODO
2011-12-22 09:07:02 +01:00
Laurent Destailleur
95a292f41b
Fix: Update licence files
2011-12-17 21:58:44 +01:00