Commit Graph

41539 Commits

Author SHA1 Message Date
Grand Philippe
1f7e6a42c2 add a Social contributions type and fix some language stuff 2013-11-24 11:33:36 +01:00
Laurent Destailleur
e45406694b Fix: no filter is value is '' 2013-11-23 19:28:41 +01:00
Laurent Destailleur
aa3c16b6af Fix: chars were lost by function 2013-11-23 16:34:08 +01:00
Laurent Destailleur
8e313ef32d Fix: Can add ban record but was not possible to delete 2013-11-23 16:17:20 +01:00
Laurent Destailleur
628e8bea83 Fix: Missing error message when files were too large. 2013-11-23 15:22:27 +01:00
Florian Henry
6615ee7e6f [ bug #1148 ] Product consomation : supplier order bad status 2013-11-23 14:59:28 +01:00
Laurent Destailleur
6ffdc039a2 Fix: When option is not set, it must not appears as set. 2013-11-23 14:51:49 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
8496b1787c Color too agressive 2013-11-23 14:46:46 +01:00
Laurent Destailleur
2cedc7bf2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-23 14:20:13 +01:00
Laurent Destailleur
f6c67404fc Remove useless warning emails 2013-11-23 14:20:03 +01:00
Laurent Destailleur
4b16551f88 Merge pull request #1316 from defrance69/patch-20
Update modAgenda.class.php
2013-11-23 05:05:55 -08:00
Laurent Destailleur
a171c40531 Merge pull request #1317 from GPCsolutions/develop-fixaddline
Made update price synchronous to avoid dependency hell
2013-11-23 05:03:01 -08:00
Laurent Destailleur
9156e9168f Add upgrade script 2013-11-23 13:19:55 +01:00
Laurent Destailleur
b8141ef2db Prepare 3.6 dev 2013-11-22 19:32:36 +01:00
Laurent Destailleur
20e6ca74c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-22 18:25:08 +01:00
Florian Henry
cca303cee6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-22 15:07:16 +01:00
simnandez
58a8f590e6 New: Add graph stats for suppliers orders in tab "stats" on products. 2013-11-22 14:47:16 +01:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
simnandez
5d34953200 New: Add list of orders products in tab "consumption" on thirdparties. 2013-11-22 14:30:29 +01:00
Laurent Destailleur
224abc3831 Fix: When option is not set, it must not appears as set. 2013-11-22 13:18:01 +01:00
Laurent Destailleur
04fdfb4047 Fix: Problem with W3C and wrapping of some title lines. 2013-11-22 11:45:42 +01:00
Cédric Salvador
2b6a5508c7 debug the Soleil model 2013-11-22 09:51:48 +01:00
Cédric Salvador
c73057ead9 show page number 2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076 show signature space on the last page only 2013-11-22 09:51:47 +01:00
Laurent Destailleur
10e5c1c22e Merge remote-tracking branch 'origin/3.5' into develop 2013-11-21 18:51:18 +01:00
Laurent Destailleur
4a1f6713ff Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
2013-11-21 18:45:33 +01:00
Laurent Destailleur
6f5e78d27e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 18:42:14 +01:00
Laurent Destailleur
29e029161f Fix: Restore translation lost because entry was not set into en_US lang. 2013-11-21 18:41:06 +01:00
Raphaël Doursenaud
302a230bf2 Made update price synchronous to avoid dependency hell 2013-11-21 18:00:27 +01:00
BENKE Charles
1bb7ddc2b1 Update modAgenda.class.php
export extensions
2013-11-21 17:32:11 +01:00
Laurent Destailleur
00b0031ddf Fix: If no permission to edit object, form to change category must be
hidden
Fix: Adding supplier category was saved into wrong table.
2013-11-21 16:34:38 +01:00
Laurent Destailleur
a7d0357d5d Fix: If no permission to edit object, form to change category must be
hidden
Fix: Adding supplier category was saved into wrong table.
2013-11-21 16:26:56 +01:00
Maxime Kohlhaas
aec0f01d08 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-11-21 16:01:04 +01:00
Florian Henry
ea0bbb5896 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 12:29:03 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user
right allow it is OK
2013-11-21 12:28:51 +01:00
Laurent Destailleur
0d853cf73d Fix: [ bug #1118 ] Minor problem on print page link 2013-11-21 02:49:22 +01:00
Laurent Destailleur
f6f4f425af Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/compta/facture.php
2013-11-21 02:31:04 +01:00
Laurent Destailleur
9e9a386852 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/compta/facture.php
2013-11-21 02:19:21 +01:00
Laurent Destailleur
e63dcc5343 Fix: [ bug #1119 ] If no country is selected for a warehouse or thids
card,
broken IMG is shown
2013-11-21 02:14:25 +01:00
Laurent Destailleur
23f7de0873 Fix: [ bug #1094 ] Invoice Text Reminder
Conflicts:
	htdocs/compta/facture.php
2013-11-21 02:07:13 +01:00
Laurent Destailleur
7871ccb9aa Fix: [ bug #1094 ] Invoice Text Reminder 2013-11-21 02:02:31 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
35596acf40 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/product/fiche.php
2013-11-20 23:46:33 +01:00
Laurent Destailleur
cb539399a0 Merge pull request #1302 from FHenry/develop
Fix output of extrafield select list from table
2013-11-20 14:42:50 -08:00
Laurent Destailleur
4adf5fc1b9 Merge pull request #1314 from FHenry/3.4
Remove useless code (the tag replacement into footer and header is already done by SetVar method)
2013-11-20 14:42:11 -08:00
Laurent Destailleur
a9d5363799 Merge pull request #1313 from altairis-fr/3.3
[Task 1144 ] Fix wrong max-length of produt ref
2013-11-20 14:33:57 -08:00
Laurent Destailleur
03006db5a7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-20 23:10:59 +01:00
Laurent Destailleur
1ef08a88a4 Update packager 2013-11-20 23:10:38 +01:00
Laurent Destailleur
a26e337550 Update doc 2013-11-20 23:05:27 +01:00