lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,651 Commits 43 Branches 150 Tags 886 MiB
6dddcbfe49
Commit Graph

42651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FRANCE Frédéric
8874e59284 Update .travis.yml 
With -p phphcs sends log output and if it take more than 10min it will
continue
 2014-07-03 20:31:25 +02:00
Juanjo Menent
24b2b83b85 use count() instead sizeof() 2014-07-03 18:55:03 +02:00
Juanjo Menent
4c7eba0ee0 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with thirds 2014-07-03 18:47:06 +02:00
Maxime Kohlhaas
db0fa0afd0 Revert "Fix : ordered should display qty in supplier order not yet send" 
This reverts commit f2248d5bc8.
 2014-07-03 18:17:34 +02:00
Maxime Kohlhaas
8eb8f33f28 Ajout qté dans écran consommation produit 2014-07-03 18:14:26 +02:00
Maxime Kohlhaas
f2248d5bc8 Fix : ordered should display qty in supplier order not yet send 2014-07-03 17:57:36 +02:00
Juanjo Menent
e30649dcd2 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with company 2014-07-03 17:39:31 +02:00
KreizIT
e0201535e2 Fix: [ bug #1505, #1504] Project trigger problem 2014-07-03 17:15:42 +02:00
KreizIT
023e7ce8ce FIX : [ bug #1502 ] DON_CREATE trigger does not intercept trigger action 
- Add DON_CREATE in interface_90_all
- Add new trigger DON_UPDATE, DON_DELETE
 2014-07-03 16:04:12 +02:00
KreizIT
07f2d9474e FIX: [ bug #1494 ] CATEGORY_CREATE and CATEGORY_MODIFY triggers do not intercept trigger action 2014-07-03 15:52:37 +02:00
Juanjo Menent
cb4c3a4431 [ task #1063 ] Allow edit localtaxes rate for thirds. Works 
withd database
 2014-07-03 15:51:46 +02:00
KreizIT
538cf90f5e FIX : [ bug #1496 ] ACTION_DELETE trigger does not show trigger error 
-Add ACTION_* trigger in interface_90_all
 2014-07-03 15:39:40 +02:00
Maxime Kohlhaas
51e4fa0d36 Fix : picto for already ordered product was missing 2014-07-03 15:31:51 +02:00
KreizIT
f0323e5b80 FIX: Contract's trigger problem 2014-07-03 15:21:43 +02:00
KreizIT
685b7b23ad FIX: Member's trigger problem 2014-07-03 15:09:46 +02:00
KreizIT
174edb6140 FIX: Intervention trigger 2014-07-03 14:57:16 +02:00
Maxime Kohlhaas
a26db9ab52 Fix : qty ordered was not including qty already received 2014-07-03 14:47:28 +02:00
Maxime Kohlhaas
a22963e432 Fix : filter by status + was not working if desiredstock not defined 2014-07-03 14:37:30 +02:00
KreizIT
7d30df42a2 ChangeLog modification 2014-07-03 14:15:15 +02:00
KreizIT
1e5c35093b Review trigger for user module 2014-07-03 14:01:01 +02:00
Laurent Destailleur
a1b6aedc90 Add field task_datehour 2014-07-03 12:53:26 +02:00
Maxime Kohlhaas
830cc30f80 Fix : sendings and reception stock calculation must be on the same status than order and oreder supplier calculation 2014-07-03 12:31:55 +02:00
Maxime Kohlhaas
b115e9b943 Fix : replenish function was not working with virtual stock 2014-07-03 12:07:34 +02:00
Maxime Kohlhaas
959c41e8db Fix : virtual stock was not correctly calculated because reception was not included. 2014-07-03 10:24:29 +02:00
Marcos García de La Fuente
e351657cc0 Removed key restrictions 2014-07-03 10:16:37 +02:00
Laurent Destailleur
ece46a9a85 Merge pull request #1697 from defrance69/patch-3 
navigate (next/prev) error on task of a project
 2014-07-02 23:30:23 +02:00
Laurent Destailleur
505a78a7ea Merge pull request #1698 from marcosgdf/translation 
Corrected English typo
 2014-07-02 23:27:52 +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
Marcos García de La Fuente
d38bebf990 Created foreign key relations for llx_product and llx_product_price table 2014-07-02 21:04:34 +02:00
Laurent Destailleur
c1d33af50d - Fix: [ bug #1517 ] Packages sizes. 2014-07-02 20:11:08 +02:00
Laurent Destailleur
de527365a8 Fix: [ bug #1517 ] Packages sizes 2014-07-02 20:10:44 +02:00
Laurent Destailleur
ea310efba5 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger
 2014-07-02 19:57:18 +02:00
Laurent Destailleur
2537a9d35f Fix: Error if module multicompany was removed without being disabled. 2014-07-02 19:44:25 +02:00
Laurent Destailleur
c2f0d84e45 Fix: [ bug #1512 ] Manque des produits dans la page réapprovisionement 2014-07-02 19:35:02 +02:00
Marcos García de La Fuente
b70a090de2 Corrected English typo 2014-07-02 19:10:17 +02:00
BENKE Charles
96876992d4 navigate (next/prev) error on task of project 
use the same showrefnav function setting present in task.php file (who
work fine)
 2014-07-02 04:27:18 +02:00
BENKE Charles
7dca46df57 navigate (next/prev) error on task of a project 2014-07-02 04:24:26 +02:00
Laurent Destailleur
57b546650a Fix: Hide title of event when agenda module disabled. 2014-06-30 19:03:52 +02:00
Laurent Destailleur
61ff1d2fb4 Merge branch 'aspangaro-develop-accounting' into develop 2014-06-30 00:42:30 +02:00
Laurent Destailleur
b985dc3342 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/install/mysql/tables/llx_bank_account.sql
 2014-06-30 00:42:17 +02:00
Laurent Destailleur
25ce734638 Merge remote-tracking branch 'origin/3.6' into develop 2014-06-30 00:00:30 +02:00
Laurent Destailleur
ebc6bede13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-29 23:59:10 +02:00
Laurent Destailleur
0044a1a334 Merge branch 'aspangaro-develop' into develop 2014-06-29 23:58:26 +02:00
Laurent Destailleur
6cf8c3d08c Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-06-29 23:57:57 +02:00
Laurent Destailleur
14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-29 23:56:23 +02:00
Laurent Destailleur
02f4016b7b Merge pull request #1693 from aspangaro/3.6 
Fix :: acount_parent must be an int - Final step
 2014-06-29 23:46:49 +02:00
Laurent Destailleur
d8b9cdf5c2 Merge pull request #1692 from atm-maxime/develop 
New : remaining to shipon delivery PDF
 2014-06-29 23:45:38 +02:00
Laurent Destailleur
6fc3111216 Merge pull request #1691 from atm-maxime/3.6 
Fix : Invoice PDF was not showing ref when created from a shipment. Now ...
 2014-06-29 23:44:18 +02:00
Laurent Destailleur
39e4cc1dda Merge branch 'KreizIT-fix1487' into develop 2014-06-29 23:42:57 +02:00