Commit Graph

38268 Commits

Author SHA1 Message Date
Laurent Destailleur
53672dff75 Fix: Confirm boxes with jmobile 2013-08-01 04:20:08 +02:00
Laurent Destailleur
a334b96469 Optimize screen size 2013-08-01 02:28:47 +02:00
Laurent Destailleur
0a2ed1f678 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-01 02:20:52 +02:00
Laurent Destailleur
4d1c0916f9 Merge pull request #1147 from FHenry/develop
[ task #1014 ] Add option to recursivly add parent category
2013-07-31 16:23:40 -07:00
Florian Henry
c5cec980c8 Fix spelling 2013-07-31 21:55:32 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Laurent Destailleur
df0a8e0829 Fix: Bad link 2013-07-31 18:43:37 +02:00
Laurent Destailleur
37592afa7e New: Add hidden option BANK_DISABLE_DIRECT_INPUT 2013-07-31 18:40:09 +02:00
Laurent Destailleur
eccfd33c38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-31 16:36:22 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Laurent Destailleur
6a998b202d Update doc 2013-07-31 15:21:48 +02:00
Laurent Destailleur
6e289874fe Merge pull request #1146 from csalvador/callfix
fixed bad function call causing select_produits_list to fail
2013-07-31 05:52:19 -07:00
Laurent Destailleur
68e13b09e9 Enhance tx tool. 2013-07-31 14:11:58 +02:00
Laurent Destailleur
6351c64a62 Test tx 2013-07-31 13:49:24 +02:00
Laurent Destailleur
37e28d8448 Removed key not used 2013-07-31 13:22:45 +02:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Laurent Destailleur
f765288f12 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
2013-07-31 12:38:15 +02:00
Laurent Destailleur
fbd3f6e67f Fix: Maxi debug of scripts 2013-07-31 12:33:18 +02:00
Laurent Destailleur
384e3812eb Fix: W3C. No form into TR. 2013-07-31 11:41:25 +02:00
Laurent Destailleur
378842e05f Fix: Better error management 2013-07-31 11:27:56 +02:00
Laurent Destailleur
c4ebdf18e7 Fix: search on contract ref 2013-07-31 11:22:52 +02:00
Laurent Destailleur
ecfca853a1 Fix: Search on contract ref 2013-07-31 11:21:05 +02:00
Laurent Destailleur
8fed036c92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-31 11:20:11 +02:00
Laurent Destailleur
0b13781cbf Fix: Search on contract ref 2013-07-31 11:19:49 +02:00
Cédric Salvador
f0bbdfddfb fixed bad function call causing select_produits_list to fail 2013-07-31 10:08:33 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management
for project.
2013-07-30 19:08:58 +02:00
Laurent Destailleur
db8af86111 Fix: W3C 2013-07-30 18:36:13 +02:00
Juanjo Menent
ba328b8710 Merge pull request #1144 from FHenry/develop
Finnalise categorie contact
2013-07-30 08:39:13 -07:00
Florian Henry
3a2f76512b Category contact again 2013-07-30 17:28:08 +02:00
Florian Henry
60bb595248 Finnalise categorie contact 2013-07-30 17:24:27 +02:00
Laurent Destailleur
57ce331833 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-30 17:23:13 +02:00
Laurent Destailleur
eeb8ef57c9 Fix: grip and close for title must differ from grip and close used for
other styles.
2013-07-30 17:22:52 +02:00
simnandez
5e2bfea879 Update ChangeLog with task 1011 2013-07-30 17:14:38 +02:00
Florian Henry
44b3ebbeb4 Contniue categorie on contact 2013-07-30 17:11:42 +02:00
Florian Henry
1260a9fd7c Complete categorie contact 2013-07-30 17:04:09 +02:00
Laurent Destailleur
962545a70e Merge pull request #1143 from atm-maxime/mko1011
New # 1011 : payment term and mode for supplier, order and invoice
2013-07-30 07:59:43 -07:00
Maxime Kohlhaas
bfb01da04f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011 2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +02:00
Laurent Destailleur
22447cd0b7 Merge pull request #1142 from FHenry/3.4
update no_email column on unsubcribe link for contact
2013-07-30 06:40:31 -07:00
Florian Henry
4d3738410e update no_email column on unsubcribe link for contact 2013-07-30 15:18:19 +02:00
Maxime Kohlhaas
dae36229a4 Task # 1011 : add payment terms and payment mode on supplier card 2013-07-30 15:06:57 +02:00
Laurent Destailleur
72e0b7579e Merge pull request #1141 from FHenry/3.4
Fix extrafield thirdparty import and export
2013-07-30 05:38:29 -07:00
Florian Henry
21bdabc248 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877 Fix extrafeild thirdparty import and export 2013-07-30 14:18:56 +02:00
Laurent Destailleur
88d1e7258b Merge pull request #1140 from atm-maxime/develop
Task # 853 : Can hide in conf the search by product supplier ref
2013-07-30 03:29:12 -07:00
Laurent Destailleur
a48236b304 Merge pull request #1139 from GPCsolutions/replenishment
Replenishment Task #918
2013-07-30 03:28:13 -07:00
Laurent Destailleur
1c24f9e35e Merge pull request #1138 from atm-maxime/3.4
Fix : Numbering on supplier invoice was not saved and on shipment displa...
2013-07-30 03:22:29 -07:00
Maxime Kohlhaas
1b54efcaaf Task # 853 : Can hide in conf the search by product supplier ref, and displayed only if product and supplier module are enabled 2013-07-30 11:26:37 +02:00
Raphaël Doursenaud
c6927404ef Merge pull request #49 from csalvador/replenishment
Replenishment
2013-07-30 02:06:12 -07:00
Cédric Salvador
370f6ac857 fixed select_product_fourn_price closes #43 2013-07-30 10:24:37 +02:00