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
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Frédéric FRANCE
c2701d735b
Update liste.php
2014-09-07 11:31:59 +02:00
Laurent Destailleur
643fc6c61f
Fix: Bad use of fetch_lines
...
Conflicts:
htdocs/comm/propal.php
htdocs/contrat/fiche.php
htdocs/opensurvey/class/opensurveysondage.class.php
2014-09-04 19:03:48 +02:00
Laurent Destailleur
73ad0f9302
Fix: Bad use of fetch_lines
2014-09-04 18:58:33 +02:00
Laurent Destailleur
38233ca05d
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/limits.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/core/ajax/ziptown.php
2014-09-02 13:46:47 +02:00
Laurent Destailleur
e82e26c6fa
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/compta/facture.php
htdocs/core/js/lib_head.js
2014-09-02 12:57:33 +02:00
Laurent Destailleur
ee65e42b1c
The "final ref" of an object must be set only once all database actions
...
are ok. So after trigger call.
If a trigger need to know new information on an object, trigger must
make a fetch on object.
Revert "Fix: define new ref before trigger"
This reverts commit cb2b6e6e40
2014-08-19 14:57:01 +02:00
Laurent Destailleur
a220634d30
Revert "Fix: define new ref before trigger"
...
This reverts commit 6ab41766c8
2014-08-19 14:53:30 +02:00
Regis Houssin
6ab41766c8
Fix: define new ref before trigger
2014-08-18 20:34:55 +02:00
Regis Houssin
cb2b6e6e40
Fix: define new ref before trigger
2014-08-18 20:28:58 +02:00
Regis Houssin
9fdfc740de
Fix: define new ref before trigger
2014-08-18 20:25:57 +02:00
Laurent Destailleur
98f140962a
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-13 19:23:45 +02:00
Laurent Destailleur
1751b58ef8
New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or
...
content template.
2014-08-06 00:46:00 +02:00
Maxime Kohlhaas
269a59e11a
Fix : warning was not calculated on the right date
2014-08-05 14:17:29 +02:00
Laurent Destailleur
164c9e0b75
New: Can defined a bcc for each email type.
2014-08-05 09:28:58 +02:00
fmarcet
67a7a210fd
Fix: Optimieze Price by Customer
2014-08-01 16:17:31 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
frederic34
6d5767e464
Merge remote branch 'upstream/develop' into selectdelivery
2014-07-28 20:15:40 +02:00
Laurent Léonard
0228cd9db7
Fix translations in e-mail forms
2014-07-28 02:45:58 +02:00
frederic34
0450498e2b
Add restriction to combo box
2014-07-26 17:17:40 +02:00
frederic34
5258c522ce
Some cleaning
2014-07-25 23:20:19 +02:00
frederic34
2df2c12cfd
The delivery method is transmited in shipment
2014-07-25 21:50:21 +02:00
frederic34
4fcff3e2e5
Select delivery method for order
2014-07-25 17:20:42 +02:00
Marcos García de La Fuente
ac824728bc
Migrated old error notifications to the """new""" system
2014-07-20 01:09:43 +02:00
Laurent Destailleur
8a8a90de78
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-07-15 23:30:15 +02:00
Laurent Destailleur
9acf60d7c5
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
.travis.yml
ChangeLog
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
2014-07-14 23:36:10 +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
8e64ea274d
Refactor: ORDER_* and LINEORDER_* trigger
2014-07-11 14:02:21 +02:00
frederic34
387d36e4b0
Ste bank account for supplier order
2014-07-09 18:00:21 +02:00
frederic34
c8e6387e52
Merge remote branch 'upstream/develop' into selectbank
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
Alexis Algoud
6d83882a5d
FIX : Bad rank when a bill was made by multiple orders
2014-07-08 09:00:41 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
frederic34
0cb5220d4d
Use english for the function name
2014-07-07 20:54:41 +02:00
frederic34
9949713d20
Some cleaning
2014-07-07 18:40:18 +02:00
frederic34
516632e41d
Select bank account for customer order
2014-07-07 17:59:04 +02:00
frederic34
f29eeceb1a
Select bank account for propal and order
2014-07-06 20:49:34 +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
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Juanjo Menent
1631985d11
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with orders
2014-07-04 11:38:08 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +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
Florian HENRY
e8bb5d5cc0
Syntax
2014-06-29 17:43:22 +02:00
Florian HENRY
1857280234
Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if
...
not defined for customer
2014-06-29 17:39:54 +02:00
Laurent Destailleur
79dec7ad90
Merge pull request #1641 from defrance69/patch-17
...
Patch 17
2014-06-26 21:43: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
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
Laurent Destailleur
1e6e5da925
Fix: sql syntax error (missing ' on date)
2014-06-25 20:07:54 +02:00
