Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb
Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-accounting3
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-14 00:59:48 +02:00
Laurent Destailleur
454cb1cbf8
Enhance skeleton
...
Add code_iso3 into array
2014-08-13 19:19:36 +02:00
aspangaro
6fd77e7ef6
Merge branch 'Upstream/develop'
2014-08-11 13:26:58 +02:00
Laurent Destailleur
4ce2495a33
Fix: Parameter morefilter is missing.
2014-08-11 11:45:25 +02:00
Laurent Destailleur
b713bd7b88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86
New: Select list of users can return user into hierarchy.
2014-08-11 11:29:47 +02:00
aspangaro
9af336b53b
Add accountancy code for trips & fees and renamed libelle field into label
2014-08-10 20:41:52 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
Laurent Destailleur
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +02:00
Laurent Destailleur
ebc11a7a9c
Fix: When disabled, all fields must be disabled. Need backport.
2014-08-07 11:50:25 +02:00
Laurent Destailleur
96b49cfabe
Fix: When disabled, all fields must be disabled. Need backport.
2014-08-07 11:08:36 +02:00
Laurent Destailleur
20cef1512f
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-06 21:34:47 +02:00
Laurent Destailleur
98eb39bf9c
Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported
2014-08-06 16:46:04 +02:00
Laurent Destailleur
2d97ad5177
Merge pull request #1771 from frederic34/selectdelivery
...
Select Shipping Method in Propal, Order
2014-07-30 11:31:22 +02:00
Laurent Destailleur
6226d39cda
Fix: Pb when option javascript disabled.
2014-07-29 19:45:48 +02:00
frederic34
6d5767e464
Merge remote branch 'upstream/develop' into selectdelivery
2014-07-28 20:15:40 +02:00
frederic34
395b003266
Merge remote branch 'upstream/develop' into selectdelivery
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-28 17:10:07 +02:00
frederic34
36c5b2d69c
Update html.form.class.php
...
By example, avoid to have html code in customer name
2014-07-28 14:04:55 +02:00
frederic34
5258c522ce
Some cleaning
2014-07-25 23:20:19 +02:00
frederic34
f0a7cc3268
Select Shipping Method in Propal
2014-07-24 18:08:08 +02:00
frederic34
5ef626813c
Update html.form.class.php
2014-07-23 09:49:58 +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
Laurent Destailleur
04a20d2008
- New: Enable feature developed for 3.6 we forgot to enabled: Adding
...
prefix on uploaded file names.
- New: No more dependency between contract and service module.
2014-07-19 22:05:35 +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
Raphaël Doursenaud
94bcb0dc40
Labels and autofocus for company card forms
2014-07-12 14:45:23 +02:00
frederic34
0cb5220d4d
Use english for the function name
2014-07-07 20:54:41 +02:00
frederic34
f29eeceb1a
Select bank account for propal and order
2014-07-06 20:49:34 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
330c965cb9
New: Add hook "searchAgendaFrom".
2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5
New: Can filter events on a group of users.
2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3
New: Can create proposal from an intervention.
2014-06-28 19:47:51 +02:00
Laurent Destailleur
dce0c38533
Fix: Add hidden option so we can restore old behaviour (duration is
...
free) for people that can't work with new one.
2014-06-21 16:06:59 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d
Fix: Confusion between is_int and is_numeric.
2014-06-09 15:21:20 +02:00
Laurent Destailleur
fb0f0047e7
Merge pull request #1633 from aspangaro/develop
...
Typo / Missing key language / Fix limit list on mass movement stock page
2014-05-30 11:33:08 +02:00
Laurent Destailleur
56d71f0da0
Fix: edit form
...
Fix: pgsql driver
2014-05-29 19:56:15 +02:00
aspangaro
e856e64bc9
Typo
2014-05-28 06:17:09 +02:00
Laurent Destailleur
4b9d1b901b
Fix: [ bug #1401 ] Problème avec la génération des codes barres
2014-05-25 17:14:33 +02:00
Laurent Destailleur
15796ec592
Fix: checkstyle errors
2014-05-14 12:19:45 +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
b56f59b313
Perf: Avoid to isntantiate object 'form' into 'subform' classes when
...
already available.
Qual: Better information into xdebug page.
2014-05-01 16:26:57 +02:00
Raphaël Doursenaud
cd774c0dcd
Qual: Missing global declaration
2014-04-23 18:23:56 +02:00
Laurent Destailleur
ce34c01b9e
New: On page to enter supplier prices, if there is no supplier, add
...
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
2014-04-16 00:06:16 +02:00
Laurent Destailleur
918de2d0a1
Fix: Payment detail are not visible.
2014-04-11 19:20:11 +02:00
Laurent Destailleur
417a1232ef
Uniformize usage of function price
2014-04-11 18:00:58 +02:00
Laurent Destailleur
13929bc46f
New: showrefnav can be used with tables without prefix.
2014-04-09 13:19:31 +02:00
