Maxime Kohlhaas
1911f6fcdc
Task 672 : add stock limitation on shipment + translation
2014-03-15 14:59:27 +01:00
Maxime Kohlhaas
b6a2fa61c8
Task 672 : only for product not services
2014-03-15 12:47:01 +01:00
Maxime Kohlhaas
9c340d7af8
Task 672 : Prevent use of product not available
2014-03-15 12:45:56 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +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
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Alexis Algoud
895f5452b4
In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted.
...
Ex in agefodd module:
$obj_link=new Propal($db);
$obj_link->id=$agf->propalid;
$resultdel=$obj_link->delete($user);
To prevent misuse of the function, the reference is not considered given
2013-12-11 15:14:29 +01:00
Francis Appels
6b6a519afd
fix sql error create commande
...
While testing on an azure website I encountered a sql error on create
commande.
azure uses cleardb with mysql version 5.5.21-log
2013-12-10 23:10:42 +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
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Laurent Destailleur
949b8c6274
Mark method classer_facturee deprecated.
...
Make better translation of some workflow options.
2013-09-16 11:50:53 +02:00
simnandez
b36dc08e00
Remove unnecessary code
2013-09-12 09:59:23 +02:00
Laurent Destailleur
92e1536d8f
Fix: checkstyle errors
2013-09-11 09:56:20 +02:00
simnandez
bc0356db1f
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 18:32:03 +02:00
simnandez
af89a794a0
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:06:15 +02:00
simnandez
43beb38c9b
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:04:36 +02:00
Laurent Destailleur
2c0a01fc8c
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-11 17:57:06 +02:00
Laurent Destailleur
27a435994a
Qual: Some methods object->addline used a first parameter that was
...
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Florian Henry
729cef3eb4
Qual: Return id of order creates instead of 1 with method
...
createFromProposal
2013-07-10 13:32:42 +02:00
Florian Henry
b9bfccd0e2
fix pgsql warning date
2013-07-10 10:35:10 +02:00
Florian Henry
4aa966f7ad
remove pgsql warning on date insert
2013-07-10 10:30:33 +02:00
Laurent Destailleur
7c163f7be3
Fix: Running fixdosfile onto all project
2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
fhenry
fefb21a56e
Fix bug on Extrafield checkbox
...
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
Laurent Destailleur
e29f533b7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce
Uniformize code for liste_array
...
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
fhenry
5dce16863f
Review delete extrafield in delete class method
2013-04-26 17:20:21 +02:00
fhenry
5d8e541292
Fetch_optionals into fetch commande
2013-04-26 16:51:01 +02:00
Laurent Destailleur
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
fhenry
24a6321d45
Fix : Add service date limit transfert from propal to order
2013-04-15 15:55:10 +02:00
Laurent Destailleur
ba93a4bfe2
Fix: Codesniffer
2013-04-10 12:20:45 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Grand Philippe
ea077e959b
normalize code
2013-04-08 14:57:06 +02:00
fhenry
dfcb38d13f
[ task #793 ] Add extrafield feature into Orders module
2013-04-05 12:43:00 +02:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Grand Philippe
12317d0371
fix trad : change adresse versus address
2013-02-15 19:18:26 +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
e8ce9cecf2
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:36:30 +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
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
ca2b3f11b1
Fix: Several fix in trigger names
2012-12-30 12:24:53 +01:00
