Commit Graph

41957 Commits

Author SHA1 Message Date
Laurent Destailleur
d219916f0a Transifex sync 2014-05-30 16:47:24 +02:00
Laurent Destailleur
e1fc9bee6b Fix: Removed deprecated test 2014-05-30 13:41:58 +02:00
Laurent Destailleur
bc7621b92e Merge remote-tracking branch 'origin/3.5' into develop 2014-05-30 11:46:47 +02:00
Laurent Destailleur
584027dd05 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-30 11:46:34 +02:00
Laurent Destailleur
4060dfe8f2 Code comment to remind goal of field. 2014-05-30 11:46:16 +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
14d76d9229 Merge pull request #1632 from nicolasb827/patch-1
Patch, missing product_type (or reset) on propal update line
2014-05-30 11:31:36 +02:00
Laurent Destailleur
040f80b0f6 Merge pull request #1631 from FHenry/3.5
Fix fiche fourn order and stuff visility according entity
2014-05-30 11:30:18 +02:00
Laurent Destailleur
9a9b0824e7 Merge pull request #1629 from defrance69/patch-15
Update fournisseur.facture.class.php
2014-05-30 11:26:00 +02:00
Laurent Destailleur
e5bd170114 Add comment 2014-05-30 11:21:24 +02:00
Laurent Destailleur
82a2a723c3 Fix: [ bug #1419 ] Margins module shows margin of sold services even if
services module is disabled
2014-05-29 21:01:00 +02:00
Laurent Destailleur
882fc42ea1 Fix: 3.5 migration that was not complete. Second chance into 3.6. 2014-05-29 20:39:51 +02:00
Laurent Destailleur
b15c79845e Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 20:27:21 +02:00
Laurent Destailleur
67bd18f5cc Fix: [ bug #1406 ] Impossible de modifier une facture fournisseur 2014-05-29 20:25:41 +02:00
Laurent Destailleur
56d71f0da0 Fix: edit form
Fix: pgsql driver
2014-05-29 19:56:15 +02:00
Laurent Destailleur
b75dea98ee Fix: sql syntax 2014-05-29 19:46:32 +02:00
Laurent Destailleur
7a670c5bc7 Fix: pgsql driver not complete
Conflicts:
	htdocs/core/db/pgsql.class.php
2014-05-29 19:39:34 +02:00
Laurent Destailleur
e8ec0f524f Fix: pgsql driver not complete 2014-05-29 19:30:51 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
f5a530e5d5 Fix: Bad permission.
Fix: Bad transaction.
2014-05-29 18:58:55 +02:00
Laurent Destailleur
1e2c452b95 Fix: If not choice at all we show all of them. 2014-05-29 18:11:14 +02:00
aspangaro
66d8b50159 Missing key language 2014-05-29 04:48:57 +02:00
Laurent Destailleur
1f8c35b70b Fix: security 2014-05-28 19:38:30 +02:00
aspangaro
a725a08c13 Fix :: List limit is not defined or based on limit product configuration
Discussion http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50579-transfert-stock-pas-sur-tous-les-produits#51265
2014-05-28 06:20:56 +02:00
aspangaro
b62fd30505 Missing key language 2014-05-28 06:17:28 +02:00
aspangaro
e856e64bc9 Typo 2014-05-28 06:17:09 +02:00
nicolasb827
c3ebece1ef fix update SQL request 2014-05-28 01:25:36 +02:00
nicolasb827
83aba41c6c copy type on line update 2014-05-28 01:18:31 +02:00
nicolasb827
c091009afb fetch product_type field from DB
When loading propal line on edit, product_type is reset to 0
2014-05-28 01:07:27 +02:00
Florian HENRY
32e3475700 Fix fiche fourn order and stuff visility according entity 2014-05-27 18:58:42 +02:00
BENKE Charles
4418a35e51 Update fournisseur.facture.class.php
rowid not declared but used
2014-05-27 15:17:59 +02:00
Laurent Destailleur
48bbcc6f4a Fix: Button was not be enabled. 2014-05-27 10:45:58 +02:00
Laurent Destailleur
33ef8595dc Fix: Bad alignement 2014-05-27 10:19:34 +02:00
Laurent Destailleur
baa573435b Fix: Exclude files from package with missing sources. 2014-05-27 00:58:00 +02:00
Laurent Destailleur
8dad341ed4 Fix: css 2014-05-27 00:57:34 +02:00
Laurent Destailleur
072aca0bd6 License violation: Missing source on min file. 2014-05-27 00:26:53 +02:00
Laurent Destailleur
1557d8973f Fix: [ bug #1403 ] suppression d'une fiche produit impossible 2014-05-26 23:12:47 +02:00
Laurent Destailleur
51b6be4a64 Fix: If user has no perm to see other user, see himself. 2014-05-26 17:33:19 +02:00
Laurent Destailleur
7bd46d8aee Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-26 17:28:00 +02:00
Laurent Destailleur
1199d54fb2 Fix: When user has no permissions to see all other user, we must keep
only user.
2014-05-26 17:21:48 +02:00
Laurent Destailleur
45161172e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-26 16:52:24 +02:00
Laurent Destailleur
4880aac45f Fix: Regression 2014-05-26 15:24:01 +02:00
Laurent Destailleur
066ae51f1e Merge pull request #1626 from GPCsolutions/qual
Qual
2014-05-26 15:19:49 +02:00
Raphaël Doursenaud
020c662537 Added a script to automatically remove PHP closing tag 2014-05-26 13:54:03 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
12fed4f4d7 Fix: CRLF 2014-05-26 12:32:33 +02:00
Laurent Destailleur
2c4a152823 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-26 09:11:08 +02:00
Laurent Destailleur
6db9bb1dda Disable a useless scrutinizer check. 2014-05-26 09:10:48 +02:00
Laurent Destailleur
93f1392e87 Fix: Bugs reported by scrutinizer 2014-05-26 09:07:18 +02:00
Laurent Destailleur
d41f87acab Fix: Option to limit was not used everywhere. 2014-05-26 01:27:22 +02:00