Laurent Destailleur
|
dc438792f4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/card.php
|
2016-01-23 11:39:37 +01:00 |
|
Laurent Destailleur
|
93b2013aa7
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
|
2016-01-22 03:29:55 +01:00 |
|
Laurent Destailleur
|
cceeefb7c2
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/societe/index.php
|
2016-01-22 03:25:30 +01:00 |
|
Laurent Destailleur
|
34c648b351
|
FIX #4418
|
2016-01-22 03:04:07 +01:00 |
|
Laurent Destailleur
|
d2f5f5c01f
|
Merge pull request #4266 from fappels/develop_multi_warehouse
Add shipping and dispatching from/to multiple warehouses
|
2016-01-22 02:26:25 +01:00 |
|
Laurent Destailleur
|
8e882b4cc2
|
NEW Add warning on tasks when they are late (add also the warning
tolerance parameter)
|
2016-01-18 15:56:51 +01:00 |
|
Regis Houssin
|
6e30d5e516
|
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
|
2016-01-15 13:16:40 +01:00 |
|
Regis Houssin
|
905f9d78ed
|
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
|
2016-01-15 13:12:19 +01:00 |
|
Laurent Destailleur
|
13f10d55fc
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-01-13 20:42:32 +01:00 |
|
fappels
|
284722ef3c
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
|
2016-01-13 16:41:34 +01:00 |
|
Laurent Destailleur
|
d396612a7c
|
NEW: Add a new method for margin calculation. Added margin on "cost
price" to margin on WAP price and margin on "best supplier price".
|
2016-01-13 12:48:59 +01:00 |
|
fappels
|
51b08f579b
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
Fix Conflicts:
|
2016-01-12 13:56:00 +01:00 |
|
aspangaro
|
cf6be40922
|
New: #3292 Make sure each and every page displays a title
|
2016-01-11 22:03:26 +01:00 |
|
Frédéric FRANCE
|
0f5870fcf9
|
Update card.php
|
2016-01-09 10:42:03 +01:00 |
|
Laurent Destailleur
|
cbe65fbc79
|
Fix: fields added into 3.8 to store email event was not enough. To late
to use them. Will be done into 4.0
|
2016-01-08 13:05:56 +01:00 |
|
Laurent Destailleur
|
a974fa858d
|
Merge pull request #4328 from frederic34/patch-8
Indentation
|
2016-01-06 18:51:55 +01:00 |
|
Laurent Destailleur
|
d6c5a73264
|
Fix missing payment fields definition in export
|
2016-01-06 17:37:01 +01:00 |
|
Laurent Destailleur
|
abe3f192fa
|
Debug and fix when using dolibarr with jmobile
|
2016-01-03 16:23:23 +01:00 |
|
Frédéric FRANCE
|
998649d467
|
Indentation
|
2016-01-02 18:51:31 +01:00 |
|
Laurent Destailleur
|
0314b3b5b1
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
ChangeLog
|
2016-01-02 12:27:08 +01:00 |
|
Laurent Destailleur
|
52cd5d505e
|
Fix several bugs on css, translation or look
|
2016-01-01 23:44:23 +01:00 |
|
phf
|
fffc8a430d
|
FIX call trigger LINEBILL_SUPPLIER_CREATE
|
2015-12-31 15:48:16 +01:00 |
|
Sof
|
c04eef35d5
|
FIX: Field cost_price does not exist and typos
|
2015-12-28 19:07:25 +01:00 |
|
Laurent Destailleur
|
6f474c403c
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
|
2015-12-27 19:15:20 +01:00 |
|
Laurent Destailleur
|
e536e10269
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
build/makepack-howto.txt
htdocs/filefunc.inc.php
|
2015-12-27 19:06:31 +01:00 |
|
Marcos García de La Fuente
|
ebdaf7dfa6
|
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
|
2015-12-27 15:12:02 +01:00 |
|
Laurent Destailleur
|
18fdb75c98
|
Missing global
|
2015-12-23 20:02:15 +01:00 |
|
Laurent Destailleur
|
559e621fd2
|
Fix conflict with trigger to delete payment customer and supplier.
|
2015-12-23 19:54:56 +01:00 |
|
Laurent Destailleur
|
db7a98f0ef
|
Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
|
2015-12-21 13:56:59 +01:00 |
|
Laurent Destailleur
|
f0802eb36b
|
FIX #4245 PHP 7
|
2015-12-19 19:48:36 +01:00 |
|
Laurent Destailleur
|
3517b64031
|
FIX #4228 PHP7 error
|
2015-12-19 18:18:24 +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 |
|
fappels
|
7fc8007571
|
New add shipping and dispatching from/to multiple warehouses
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
|
2015-12-18 18:00:31 +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 |
|
philippe grand
|
2cd49043a6
|
[Qual] Close database handler should be after Footer
|
2015-12-11 19:37:12 +01:00 |
|
philippe grand
|
fc8c12d6f6
|
[Qual] Uniformize code
|
2015-12-10 16:14:37 +01:00 |
|
Laurent Destailleur
|
3bcdc5c9c0
|
Merge pull request #4181 from grandoc/develop
[Qual] Uniformize code
|
2015-12-10 13:35:44 +01:00 |
|
Laurent Destailleur
|
c497a5e526
|
Merge pull request #4171 from IonAgorria/fix-dateranges
Fix date handling for hours/mins in some pages
|
2015-12-10 13:08:30 +01:00 |
|
philippe grand
|
01c6728aa9
|
[Qual] Uniformize code
|
2015-12-08 11:35:08 +01:00 |
|
Ion Agorria
|
1dc5854535
|
Fix date handling for hours/mins in some pages
|
2015-12-07 03:59:03 +01:00 |
|
Laurent Léonard
|
7e31c8f38f
|
Fix decimals in payments of supplier invoices
|
2015-12-07 01:27:08 +01:00 |
|
Laurent Destailleur
|
055e650adf
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-02 23:23:38 +01:00 |
|
Laurent Destailleur
|
574b270da0
|
Work on the "mass action" feature. Can run mass action on
result of a select.
|
2015-12-02 22:00:39 +01:00 |
|
Laurent Destailleur
|
de730c9762
|
NEW Introduce cost price on product.
|
2015-11-30 21:20:45 +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
|
b0e938fab4
|
Fix missing td cell
|
2015-11-29 13:15:02 +01:00 |
|
Laurent Destailleur
|
5df193ec93
|
Uniformize code
|
2015-11-28 20:25:50 +01:00 |
|
Laurent Destailleur
|
88e76dcf64
|
Fix utf8 encoded twice
|
2015-11-28 14:40:23 +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 |
|
Laurent Destailleur
|
ab177b43af
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
|
2015-11-13 12:35:10 +01:00 |
|
Laurent Destailleur
|
b2285ca5e0
|
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
All emails sent from Dolibarr have a dedicated tracking id.
|
2015-11-12 21:25:01 +01:00 |
|
Laurent Destailleur
|
096ec3100d
|
Merge pull request #3926 from frederic34/fccard
allow chaining and remove header exit
|
2015-11-08 15:49:33 +01:00 |
|
Juanjo Menent
|
f15e83e918
|
Merge pull request #3937 from marcosgdf/bug-3877
FIX #3877 HTML encoded strings when searching for a supplier invoice
|
2015-11-08 11:19:49 +01:00 |
|
Laurent Destailleur
|
3906cb79c5
|
NEW: Add parameter to add a link to use "date of invoice" in one click
when fille a payment card.
|
2015-11-07 23:46:07 +01:00 |
|
Marcos García de La Fuente
|
ba42a7779f
|
FIX #3877 HTML encoded strings when searching for a supplier invoice
Close #3877
|
2015-11-07 14:34:26 +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
|
4bb21fd218
|
Merge pull request #3884 from FHenry/3.8
FIX #3880
|
2015-11-05 02:32:32 +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
|
77371af35a
|
FIX #3661 Margin is not selected correctly when adding a product
|
2015-11-05 01:08:30 +01:00 |
|
Florian HENRY
|
876ab4bb59
|
FIX : #3882
|
2015-11-04 18:30:09 +01:00 |
|
Florian HENRY
|
d4ee183662
|
FIX : 3880
|
2015-11-04 18:21:59 +01:00 |
|
Laurent Destailleur
|
df4f09e72f
|
FIX #3240
|
2015-11-03 14:02:36 +01:00 |
|
Laurent Destailleur
|
da0aa2f937
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
|
2015-11-02 19:31:42 +01:00 |
|
Laurent Destailleur
|
d8796e4cc7
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/product/stats/commande.php
htdocs/product/stats/commande_fournisseur.php
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
htdocs/product/stats/propal.php
|
2015-11-02 19:25:51 +01:00 |
|
Laurent Destailleur
|
a9ddcc1a80
|
Merge pull request #3832 from frederic34/patch-16
NEW Add supplier order to the Direct Printing System
|
2015-11-02 11:27:00 +01:00 |
|
Laurent Destailleur
|
72915aa16d
|
Merge pull request #3784 from All-3kcis/develop-patch-11
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
|
2015-11-02 11:23:49 +01:00 |
|
All-3kcis
|
a658ff7e90
|
add commit or rollback if error
|
2015-11-02 10:26:07 +01:00 |
|
Laurent Destailleur
|
2c682022cf
|
NEW The search box and the bookmarks are now rendered by the menu
manager.
|
2015-10-30 09:36:57 +01:00 |
|
Laurent Destailleur
|
6cc3df7e71
|
NEW Quick searh filter works on invoice, proposal, order, intervention,
contract
|
2015-10-30 08:35:56 +01:00 |
|
Frédéric FRANCE
|
ff9648eed9
|
Update card.php
|
2015-10-29 19:09:37 +01:00 |
|
fmarcet
|
310ecb1e09
|
FIX: Show product image on getNomUrl()
|
2015-10-29 12:28:28 +01:00 |
|
atm-robin
|
29b8919a40
|
FIX supplier rights for orderToInvoice
|
2015-10-26 14:34:46 +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 |
|
Maxime Kohlhaas
|
ef2337a338
|
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Conflicts:
htdocs/compta/facture/list.php
|
2015-10-22 14:41:58 +02:00 |
|
All-3kcis
|
00c2b1a32a
|
move db->begin() before trigger
|
2015-10-22 14:30:11 +02:00 |
|
All-3kcis
|
ceae04b76e
|
move trigger before query
|
2015-10-22 12:03:01 +02:00 |
|
Laurent Destailleur
|
f312ee58de
|
Merge pull request #3779 from All-3kcis/develop-patch-10
Correct return value
|
2015-10-22 10:35:55 +02:00 |
|
Laurent Destailleur
|
474692e71a
|
Remove duplicate page fourn/list.php
|
2015-10-22 09:48:16 +02:00 |
|
Frédéric FRANCE
|
4689b0cc11
|
Update fournisseur.commande.class.php
|
2015-10-21 17:31:51 +02:00 |
|
All-3kcis
|
ca8c1adf55
|
Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price()
|
2015-10-21 10:07:53 +02:00 |
|
All-3kcis
|
3cb2637f25
|
Correct return value
|
2015-10-20 09:42:02 +02:00 |
|
Laurent Destailleur
|
22979523db
|
Try a fix for #3742
|
2015-10-20 02:34:53 +02:00 |
|
Maxime Kohlhaas
|
572be23fc1
|
FIX : filters on supplier invoices list are not used, search_status instead
|
2015-10-19 15:57:23 +02:00 |
|
Laurent Destailleur
|
9ad998d0be
|
Add comments
|
2015-10-18 21:51:09 +02:00 |
|
Laurent Destailleur
|
a90c5ce962
|
Revert "Add currently used sortfields and sortorder"
This reverts commit 0663932589.
|
2015-10-18 21:48:17 +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 |
|
Juanjo Menent
|
1f05cb844c
|
Merge pull request #3755 from grandoc/develop
[Qual] Uniformize code
|
2015-10-18 12:35:17 +02:00 |
|
Juanjo Menent
|
02c1f37a95
|
Merge pull request #3747 from fappels/develop-best-pmp-pos-margin
Qual getSupplierPrices
|
2015-10-18 12:10:29 +02:00 |
|
philippe grand
|
1762b3aaa7
|
[Qual] Uniformize code
|
2015-10-17 17:09:34 +02:00 |
|
Laurent Destailleur
|
3d94e3d80e
|
FIX Editing a supplier price should keep the vat.
|
2015-10-17 12:01:17 +02:00 |
|
Frédéric FRANCE
|
d68db2a844
|
Update fournisseur.commande.class.php
|
2015-10-17 08:48:53 +02:00 |
|
Laurent Destailleur
|
3ce147ccc1
|
Use new architecture for quick search for the account area.
|
2015-10-17 02:41:09 +02:00 |
|
Laurent Destailleur
|
2122d4d43a
|
NEW Contract module can be used to follow both sold and bought
contracts/recurring subscriptions.
|
2015-10-17 00:52:35 +02:00 |
|
fappels
|
0663932589
|
Add currently used sortfields and sortorder
|
2015-10-16 12:51:49 +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 |
|
fappels
|
74c373a3af
|
Qual getSupplierPrices
use productfourn method list_product_fournisseur_price because query has
same purpose.
|
2015-10-15 22:54:42 +02:00 |
|
Laurent Destailleur
|
a84ec64ece
|
The new banner tab is available on all tabs of thirdparty.
|
2015-10-13 13:06:32 +02:00 |
|
Laurent Destailleur
|
80bd563fde
|
Use GETPOST
|
2015-10-11 20:41:06 +02:00 |
|
Laurent Destailleur
|
61d739635e
|
Uniformize code and css for tables. Filters must be implemented
following example in test_arrays.php.
|
2015-10-09 12:30:16 +02:00 |
|
Laurent Destailleur
|
8d47a307bb
|
Better use of space
|
2015-10-06 21:52:42 +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 |
|
Laurent Destailleur
|
f54a1ca367
|
CSS enhancement
|
2015-10-06 01:03:31 +02:00 |
|
frederic34
|
1e8ff69267
|
Optioncss
|
2015-10-04 13:34:55 +02:00 |
|
frederic34
|
f2d7523091
|
Optioncss
|
2015-10-04 12:31:32 +02:00 |
|
frederic34
|
ed917ab447
|
Optioncss
|
2015-10-04 11:30:28 +02:00 |
|
frederic34
|
9a021e6de4
|
Optioncss not kept in list
|
2015-10-04 10:45:57 +02:00 |
|
Juanjo Menent
|
31230d296d
|
Merge remote-tracking branch 'upstream/3.8' into develop
|
2015-10-03 23:51:38 +02:00 |
|
Juanjo Menent
|
8f28e7cf1c
|
Merge remote-tracking branch 'upstream/3.8' into 3.8
|
2015-10-03 23:34:37 +02:00 |
|
Juanjo Menent
|
8febf25c23
|
Fix: #3566
|
2015-10-03 23:34:10 +02:00 |
|
Juanjo Menent
|
bc01d28061
|
Fix: formconfirm printing
|
2015-10-03 22:59:22 +02:00 |
|
philippe grand
|
e22fb3c538
|
fix : Typo
|
2015-10-02 12:39:09 +02:00 |
|
philippe grand
|
8a9c9f49d5
|
fix : Typo
|
2015-10-02 12:37:13 +02:00 |
|
Laurent Destailleur
|
62792c08eb
|
Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
|
2015-09-26 11:23:59 +02:00 |
|
Juanjo Menent
|
ad1a4c7e15
|
Merge pull request #3598 from GPCsolutions/formconfirm
[Qual] Replaced deprecated form_confirm()
|
2015-09-26 08:48:16 +02:00 |
|
Juanjo Menent
|
6999ad0a4f
|
Merge pull request #3587 from GPCsolutions/fiche_titre
[Qual] Replaced deprecated function calls.
|
2015-09-26 08:39:22 +02:00 |
|
Raphaël Doursenaud
|
485c369d55
|
[Qual] Replaced deprecated form_confirm()
|
2015-09-24 21:10:35 +02:00 |
|
Raphaël Doursenaud
|
67ddb6c94e
|
[Qual] Cleanup of inherited class properties
|
2015-09-24 20:12:55 +02:00 |
|
Raphaël Doursenaud
|
631ee83745
|
[Qual] Replaced deprecated print_fiche_titre()
|
2015-09-24 18:34:58 +02:00 |
|
Raphaël Doursenaud
|
dabfad1529
|
[Qual] Replaced deprecated print_titre()
|
2015-09-24 18:27:13 +02:00 |
|
Raphaël Doursenaud
|
9f2545b95d
|
[Qual] Replaced deprecated dol_clone by native clone
|
2015-09-24 17:24:40 +02:00 |
|
Laurent Destailleur
|
f81df66564
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/.gitignore
htdocs/categories/edit.php
|
2015-09-23 00:34:57 +02:00 |
|
Laurent Destailleur
|
077c696c09
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/.gitignore
htdocs/theme/.gitignore
|
2015-09-22 16:28:34 +02:00 |
|
Laurent Destailleur
|
da6a1d6629
|
NEW Introduce a method getDefaultCreateValueForField for developers to
get a default value to use for a form in create mode.
Implement it for public and private notes.
|
2015-09-22 13:55:31 +02:00 |
|
Laurent Destailleur
|
9cbd236c8c
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/filefunc.inc.php
|
2015-09-16 22:09:21 +02:00 |
|
Laurent Destailleur
|
e36928fd65
|
FIX #3529
|
2015-09-16 21:23:52 +02:00 |
|
Florian HENRY
|
8fd9d2a7ce
|
FIX : #3530
|
2015-09-16 10:21:32 +02:00 |
|
Laurent Destailleur
|
b94fb9e1f3
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-09-12 18:22:10 +02:00 |
|
Laurent Destailleur
|
db3c544e21
|
Fix #3240 [Supplier orders] Dashboard links to unuseful page
|
2015-09-12 18:14:08 +02:00 |
|
Laurent Destailleur
|
94723a9b83
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
|
2015-09-12 15:23:02 +02:00 |
|
Laurent Destailleur
|
1966d75ced
|
FIX #3490
|
2015-09-12 12:50:55 +02:00 |
|
Laurent Destailleur
|
db1d9d6d8e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/dispatch.php
|
2015-09-12 11:50:46 +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 |
|
Laurent Destailleur
|
a83b3ae7e8
|
Merge pull request #3503 from fappels/3.7-dispatch-rounding
Fix #3471 3.7 Rounding issue when dispatching non-integer
|
2015-09-12 11:07:16 +02:00 |
|