lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,738 Commits 43 Branches 150 Tags 886 MiB
1df07a7d9c
Commit Graph

33383 Commits

Author SHA1 Message Date
Christophe Battarel
4c7741f5f0 manage user permissions for margin display 2013-08-20 12:11:19 +02:00
Christophe Battarel
06b8e939bd manage user permissions for margin rate 2013-08-20 12:04:01 +02:00
Christophe Battarel
220f9b7e9f define global user variables so templates can manage user permissions 2013-08-20 12:01:52 +02:00
Christophe Battarel
8128ed0556 define user permissions on margin module 
update changelog
 2013-08-20 12:00:16 +02:00
Laurent Destailleur
e460aa335c New: When there is no data on pie chart, can set color to an empty 
value.
 2013-08-20 11:51:24 +02:00
Juanjo Menent
002c3097c7 Merge pull request #1180 from FHenry/develop 
Add category into filter into webservice thirdparty method
 2013-08-20 00:29:27 -07:00
simnandez
9741b49b75 [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg
 2013-08-20 09:28:23 +02:00
Laurent Destailleur
b18d5166de Fix: Size of picture into PDF 2013-08-19 13:30:30 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Florian Henry
4932c116e0 fix mispelling 2013-08-15 12:50:16 +02:00
Florian Henry
472d218372 Add category into filter into webservice thirdparty method 
getListOfThirdParties
 2013-08-15 10:39:59 +02:00
simnandez
fa5f09d6e0 [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg: Works in admin
 2013-08-14 12:48:00 +02:00
simnandez
88356acc3a [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg: Init works in admin
 2013-08-14 11:11:49 +02:00
Juanjo Menent
8ba3410766 Merge pull request #1179 from altatof/saisie_marges 
ability to define margin rate on quotes, orders, invoices
 2013-08-14 01:00:29 -07:00
Florian Henry
d7d3aeff8f Fix canvas feature broken 2013-08-14 09:56:43 +02:00
Florian Henry
6cb274e25e Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7 2013-08-14 09:56:30 +02:00
simnandez
3577025f0e Fix update extrafield do not display immediatly 2013-08-14 09:56:08 +02:00
Florian Henry
60b3f61339 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-08-13 12:13:47 +02:00
Florian Henry
d6c7ac5f73 Fix canvas feature broken 2013-08-13 09:16:39 +02:00
Florian Henry
da565b2c7f Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7 2013-08-12 19:43:51 +02:00
simnandez
5cbfa61731 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Florian Henry
26d1352de4 Fix update extrafield do not display immediatly 2013-08-12 14:30:42 +02:00
Laurent Destailleur
34987d3e8b Exclude conf.php file from git 2013-08-10 13:02:13 +02:00
Laurent Destailleur
5c2e626338 More css3 2013-08-10 12:06:18 +02:00
Laurent Destailleur
5841edd40f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-10 02:40:29 +02:00
Laurent Destailleur
8e5537f1ce New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK. 2013-08-10 02:40:11 +02:00
Laurent Destailleur
3502747247 Merge pull request #1175 from FHenry/develop 
Add pdf link into supplier invoice list and supplier order list
 2013-08-09 12:18:40 -07:00
Laurent Destailleur
ff4ebe423b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-09 19:21:32 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
simnandez
ee107a64b4 Trad: Update ca_ES dict.lang 2013-08-09 15:33:31 +02:00
simnandez
23be083637 Trad: Update ca_ES exports.lang 2013-08-09 15:31:40 +02:00
simnandez
2ae3af7851 Trad: Update ca_ES other.lang 2013-08-09 15:29:30 +02:00
simnandez
1b1f44edbb Trad: Update ca_ES commercial.lang 2013-08-09 15:27:48 +02:00
simnandez
b54fc29a07 Trad: Update ca_ES suppliers.lang 2013-08-09 15:25:55 +02:00
simnandez
f0445cd7a0 Trad: Update ca_ES languages.lang 2013-08-09 15:23:41 +02:00
simnandez
7eecf88c8c Trad: Update ca_ES ftp.lang 2013-08-09 15:21:22 +02:00
simnandez
25e970757e Trad: Update ca_ES paypal.lang 2013-08-09 15:18:06 +02:00
simnandez
911b4965a2 Trad: Update ca_ES donations.lang 2013-08-09 15:16:04 +02:00
simnandez
e2cc4a9545 Trad: Update ca_ES externalsite.lang 2013-08-09 15:12:44 +02:00
simnandez
a2005ed603 Trad: Update ca_ES mailmanspip.lang 2013-08-09 15:10:10 +02:00
Florian Henry
0a8c7f7639 Generate auto supplier invoice 2013-08-09 13:59:37 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Laurent Destailleur
0621233b9a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-09 13:26:51 +02:00
Laurent Destailleur
b4f040bc63 Synchronize romania from transifex. 2013-08-09 13:20:34 +02:00
Florian Henry
75701ee995 Fix: Supplier invoice and supplier order are not displayed into object 
link into agenda event card
 2013-08-09 13:11:18 +02:00
simnandez
057df6df85 Trad: Update ca_ES and es_ES admin.lang 2013-08-09 11:50:12 +02:00
simnandez
868571061b Trad: Update ca_ES and es_ES bills.lang 2013-08-09 11:44:12 +02:00
simnandez
728edd0ab3 Trad: Update ca_ES and es_ES companies.lang 2013-08-09 11:41:27 +02:00
simnandez
a79cb97235 Trad: Update ca_ES and es_ES main.lang 2013-08-09 11:37:39 +02:00
simnandez
e762f76d86 Trad: Update ca_ES and es_ES users.lang 2013-08-09 11:32:35 +02:00
simnandez
372ef135d5 Trad: Update ca_ES and es_ES commercial.lang 2013-08-09 11:28:24 +02:00
simnandez
f853039b2f Trad: Update ca_ES and es_ES ecm.lang 2013-08-09 11:26:12 +02:00
simnandez
55436940e1 Trad: Update ca_ES and es_ES holiday.lang 2013-08-09 11:19:59 +02:00
simnandez
a7431c1165 Trad: Update ca_ES and es_ES banks.lang 2013-08-09 11:10:52 +02:00
simnandez
3aa9de7cfa Trad: Update ca_ES and es_ES interventions.lang 2013-08-09 10:57:41 +02:00
Laurent Destailleur
ecf8e06487 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-08 20:07:24 +02:00
Laurent Destailleur
bfd2d7ada2 Fix: Sort order works with special chars. 2013-08-08 20:06:56 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
b7dd059f99 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-08 01:54:22 +02:00
Laurent Destailleur
3a209afa94 Update societe.class.php 
Add missing space
 2013-08-08 01:54:08 +02:00
Laurent Destailleur
bf95cf40d9 Merge pull request #1164 from PaulPoulain/966-develop 
T966-develop : Put the poste of the contact in the list
 2013-08-07 16:51:27 -07:00
Laurent Destailleur
2a0597a6d4 Merge pull request #1161 from PaulPoulain/948-develop 
T948-develop :Classify Billed when the price of bill is greater than command
 2013-08-07 16:48:32 -07:00
Laurent Destailleur
fe3e59ed12 Fix: Use reserved word None when we don't want thousand separator. 2013-08-08 01:47:22 +02:00
Laurent Destailleur
1a8b49c2c7 Merge pull request #1171 from braito4/patch-1 
Update fiche.php
 2013-08-07 13:37:56 -07:00
Laurent Destailleur
b1f528f4d5 Comment code of a deprecated variable. 2013-08-07 20:56:10 +02:00
braito4
561d0ea46b Update fiche.php 2013-08-07 20:48:50 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33 Fix: Bad dir 2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4 Fix: Bad var name 2013-08-07 13:33:22 +02:00
lalaina rasamoelina
c0d3ed0d60 T966-develop : Put the poste of the contact in the list 
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
 2013-08-07 10:17:18 +02:00
BENKE Charles
2548274c10 Update products.lang 
add header translation
 2013-08-07 07:32:27 +02:00
BENKE Charles
12479a946a Update index.php 
Error on column titles
 2013-08-07 07:28:37 +02:00
BENKE Charles
54d2f1161d Update index.php 
change datep
 2013-08-07 07:15:09 +02:00
Laurent Destailleur
23516a466c Fix: Pb with predefined invoices 2013-08-06 23:56:13 +02:00
Laurent Destailleur
7438809ab5 Make predefined invoice feature easier to use. 2013-08-06 23:55:17 +02:00
Laurent Destailleur
acf3db8512 Fix: Pb with predefined invoices 2013-08-06 23:50:12 +02:00
Laurent Destailleur
f57aaf4f4a Fix: Do not load class like it should 2013-08-06 22:58:26 +02:00
Laurent Destailleur
cb4b8ffb8a Fix: Do not load class like it should 2013-08-06 22:57:53 +02:00
BENKE Charles
024ba2ee42 Update index.php 
Add quarter report of sell service/product
 2013-08-06 21:31:32 +02:00
Laurent Destailleur
4346a3f90f Fix: Param must be a regex string 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-08-06 19:34:13 +02:00
Laurent Destailleur
3caf119596 Fix: Param must be a regex string 2013-08-06 19:23:43 +02:00
Laurent Destailleur
7a8d28f135 Several fix for last pull request: 
- A property of an element must be shown under another element
- Property that may be page content must not be output into a list.
- Bad W3C (<br> must not be <br />)
- Must not use picto to edit a property to define a link to a page
(replaced with generic sheet picto).
 2013-08-06 19:12:26 +02:00
Laurent Destailleur
8533688020 Merge pull request #1159 from PaulPoulain/962-develop 
T962-develop: Put the private note in the order list
 2013-08-06 09:45:07 -07:00
Laurent Destailleur
7a17d52dad Merge pull request #1157 from PaulPoulain/961-develop 
T961-develop: Put the private note in the bill list
 2013-08-06 09:44:28 -07:00
Laurent Destailleur
480355f4f0 Merge pull request #1158 from PaulPoulain/960-develop 
T960-develop : Put the note_private in the propal list
 2013-08-06 09:44:10 -07:00
Laurent Destailleur
837c34ba62 Qual: Add more complete help text into setup page. 2013-08-06 17:26:26 +02:00
Laurent Destailleur
60a1fce2d1 Sec: Do not autofill password for remote access 2013-08-06 17:26:05 +02:00
Laurent Destailleur
4b6d2a3931 Synchro with transifex 2013-08-06 17:04:40 +02:00
lalaina rasamoelina
0fa4739d47 T948-develop :Classify Billed when the price of bill is greater than command 
-In the workflow i've added on bouton which permitted
		to classify billed when the price of bills is greater
 		than command,if her status is delivered

		/htdocs/admin/workflow.php
 2013-08-06 16:57:40 +02:00
lalaina rasamoelina
88bdecd2fb T962-develop: Put the private note in the order list 
In the command list, if there are the private notes,we print them and we can edit them
htdocs/commande/liste.php
 2013-08-06 16:49:47 +02:00
lalaina rasamoelina
2e25d17372 T960-develop : Put the note_private in the propal list 
In the propal list, if there are the private notes,we print them and we can edit them
htdocs/comm/propal/list.php
 2013-08-06 16:41:36 +02:00
lalaina rasamoelina
a8ba4e1861 T961-develop: Put the private note in the bill list 
In the invoice list, if there are the private notes,we print them and we can edit them
htdocs/compta/facture/liste.php
 2013-08-06 16:36:16 +02:00
Juanjo Menent
aab90bfe76 Merge pull request #1154 from atm-maxime/develop 
Fix : supplier invoice mask + numbering
 2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e Numbering should be on invoice date, not creation date 2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905 Fix : supplier invoice mask + numbering 2013-08-06 15:27:51 +02:00
Laurent Destailleur
a8784faa1e Fix: Removed debug print 2013-08-06 13:24:12 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6 Fix: lang file 2013-08-06 03:56:59 +02:00
Laurent Destailleur
80e04e967c Start to uniformize default debian package with current official 
package on work.
 2013-08-06 03:10:51 +02:00
Laurent Destailleur
b7cada9a99 Fix: End of menu when no module selected. 2013-08-06 03:01:56 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
06c49e99bb Update for greek 2013-08-05 23:43:24 +02:00
Laurent Destailleur
a0944d99d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-05 23:28:04 +02:00
Laurent Destailleur
784c8acaf7 Trans: Upgrade language file 2013-08-05 23:27:13 +02:00
Laurent Destailleur
8ddeff69d6 Trans: update el_GR 2013-08-05 23:26:40 +02:00
Laurent Destailleur
8d90289bfc Merge pull request #1153 from csalvador/print_address_hook 
added hook to the print address function
 2013-08-05 11:51:08 -07:00
Laurent Destailleur
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
2336a260d3 New: Add line "minimum amount desired into bank graph". 2013-08-05 18:54:03 +02:00
Laurent Destailleur
928446596d Perf: Optimize memory usage when generating graph. 2013-08-05 18:30:10 +02:00
Cédric Salvador
0127ed8b33 added hook to the print address function 2013-08-05 18:07:10 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00
simnandez
16eba64568 Trad: Add missing modules info 2013-08-05 17:05:59 +02:00
simnandez
a16b3b6e73 Trad: Add missing translation 2013-08-05 16:32:35 +02:00
simnandez
2e3db5e7e3 Trad: Add ca_ES and es_ES printipp.lang 2013-08-05 16:14:50 +02:00
simnandez
b9d9044208 Trad: Update ca_ES and es_ES cron.lang 2013-08-05 16:07:54 +02:00
simnandez
f6fe439766 Trad: Update ca_ES and es_ES boxes.lang 2013-08-05 15:59:08 +02:00
simnandez
5dd17bbe0a Trad: Update ca_ES and es_ES projects.lang 2013-08-05 15:48:33 +02:00
simnandez
2867641ebb Trad: Update ca_ES and es_ES mails.lang 2013-08-05 12:54:50 +02:00
simnandez
438badce02 Trad: Update ca_ES and es_ES products.lang 2013-08-05 12:50:36 +02:00
simnandez
10e0c528a5 Trad: Update ca_ES and es_ES propal.lang 2013-08-05 12:46:26 +02:00
simnandez
4c7798ff98 Trad: Update suppliers.lang 2013-08-05 12:40:55 +02:00
simnandez
25a7bb994d Trad: Update ca_ES and es_ES compta.lang 2013-08-05 12:24:12 +02:00
simnandez
4ca8852eaf Trad: Update ca_ES and es_ES sendings.lang 2013-08-05 12:10:42 +02:00
simnandez
06228569ef Trad: Update ca_ES and es_ES orders.lang 2013-08-05 12:04:19 +02:00
simnandez
fd475f385f Trad: Update ca_ES and es_ES stocks.lang 2013-08-05 11:55:33 +02:00
simnandez
def59df002 Trad: Update ca_ES and es_ES agenda.lang 2013-08-05 11:47:24 +02:00
simnandez
ef6a063cfb Trad: Update ca_ES and es_ES categories.lang 2013-08-05 11:38:43 +02:00
simnandez
00943410cd Trad: Update ca_ES and es_ES contracts.lang 2013-08-05 11:32:11 +02:00
simnandez
7a47e910ff Trad: Update ca_ES and es_ES errors.lang 2013-08-05 11:26:48 +02:00
simnandez
86156746cf Trad: Update ca_ES and es_ES bills.lang 2013-08-05 11:14:53 +02:00
simnandez
673b6f21a0 Trad: Update ca_ES and es_ES languages.lang 2013-08-05 10:32:56 +02:00
Laurent Destailleur
e57360a886 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-05 10:12:58 +02:00
Laurent Destailleur
aab1a6d958 New: Add hook addHomeSetup 2013-08-05 10:10:44 +02:00
simnandez
9111226761 Trad: Update ca_ES and es_ES admin.lang 2013-08-05 10:00:34 +02:00
Laurent Destailleur
447d0063af Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/sl_SI/withdrawals.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/bills.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/other.lang
	htdocs/langs/zh_CN/products.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/agenda.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/companies.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/contracts.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/exports.lang
	htdocs/langs/zh_TW/install.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/mails.lang
	htdocs/langs/zh_TW/members.lang
	htdocs/langs/zh_TW/orders.lang
	htdocs/langs/zh_TW/propal.lang
	htdocs/langs/zh_TW/suppliers.lang
 2013-08-03 16:24:52 +02:00
Laurent Destailleur
4ec86717be Fix: Bad char % 2013-08-03 15:51:32 +02:00
Laurent Destailleur
3dd1841ab6 New: Add language code files for South Africa. 2013-08-03 02:02:25 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
Laurent Destailleur
c18fed7e4c New: A box can use a "or" on module conditions 2013-08-02 14:54:22 +02:00
Juanjo Menent
ba8d094ec5 Merge pull request #1152 from atm-maxime/develop 
Better fix for email text / signature integration
 2013-08-02 03:13:42 -07:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Maxime Kohlhaas
229c2d890f Add possibility to define default VAT accountancy code for purchase 2013-08-02 10:43:53 +02:00
Maxime Kohlhaas
a0738e86d8 Better fix for email text / signature integration 2013-08-02 10:24:09 +02:00
Ricardo Sequeira
4572ff5af5 Improved translation 2013-08-01 23:09:03 +01:00
Laurent Destailleur
a35ee022f3 Merge pull request #1150 from atm-maxime/develop 
Task # 1016 : deposits numbering
 2013-08-01 13:06:46 -07:00
Laurent Destailleur
1cec6383e7 Merge pull request #1149 from csalvador/hookcalls 
print hooks results in thirdparty/contact cards
 2013-08-01 13:02:12 -07:00
Laurent Destailleur
298a35a347 Merge pull request #1148 from csalvador/replenish-fix 
init cond_reglement_id and mode_reglement_id to 0 in orders creations to...
 2013-08-01 12:59:32 -07:00
Laurent Destailleur
b6b5479635 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-01 20:09:39 +02:00
simnandez
d8fcec287b Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain. 2013-08-01 18:44:21 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:01:25 +02:00
Laurent Destailleur
d8778ce0f7 Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:52:21 +02:00
Laurent Destailleur
a144b1307b Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:49:17 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Maxime Kohlhaas
eccbf89ecd Bank account sharing for multi company 2013-08-01 16:15:53 +02:00
Cédric Salvador
69d6b6f348 print hooks results in thirdparty/contact cards 2013-08-01 16:02:37 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Cédric Salvador
3c93aac071 init cond_reglement_id and mode_reglement_id to 0 in orders creations to avoid SQL errors 2013-08-01 15:03:47 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Laurent Destailleur
af026690d4 Fix: Bad sql requests 2013-08-01 12:22:05 +02:00
Laurent Destailleur
2fa1032079 Merge pull request #1145 from atm-maxime/develop 
Fix : email message combined with html signature made troubles with line breaks
 2013-08-01 02:09:52 -07:00
Laurent Destailleur
9f25b457ad Fix: CSS 2013-08-01 05:23:15 +02:00
Laurent Destailleur
ba2c6d4d54 Fix: Confirm boxes with jmobile 2013-08-01 05:13:13 +02:00
Laurent Destailleur
70eef21bc8 Fix: Style with jmobile 2013-08-01 04:36:54 +02:00
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
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
Maxime Kohlhaas
3395df2b66 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 15:23:27 +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
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
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
Maxime Kohlhaas
27cfe802aa Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 09:03:20 +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
Maxime Kohlhaas
c40e187842 Typo 2013-07-30 17:30:09 +02:00
Maxime Kohlhaas
dfae157cc5 Fix : email message combined with html signature made troubles with line breaks 2013-07-30 17:29:24 +02: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
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
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
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
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
Cédric Salvador
370f6ac857 fixed select_product_fourn_price closes #43 2013-07-30 10:24:37 +02:00
Maxime Kohlhaas
f9c2910f84 Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok 2013-07-30 09:21:45 +02:00
Maxime Kohlhaas
4d2d5ebbd5 Typo 2013-07-30 09:12:13 +02:00
Laurent Destailleur
87713c49ac New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with 
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
 2013-07-29 19:12:04 +02:00
Cédric Salvador
1993964a46 don't display product if desiredstock = 0 or null 2013-07-29 12:31:17 +02:00
Cédric Salvador
44bde866ee link to go to the second tab and only display orders related to a certain product 2013-07-29 12:31:17 +02:00
Cédric Salvador
c756d34940 changed pictos used in replenish.php 2013-07-29 12:31:17 +02:00
Cédric Salvador
72a3bd9bdd moved warning picto 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
7d573bce1d PSR-0 coding style 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
18ec06a7f9 Allowed displaying products without buying price 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
8d6591ac2f Better comment 2013-07-29 12:31:16 +02:00
Cédric Salvador
5643a714ce changed tab name 2013-07-29 12:31:16 +02:00
Cédric Salvador
d4052f7b9c warning message if you try to create orders without selecting any product 2013-07-29 12:31:16 +02:00
Cédric Salvador
9ff183d432 debug checkbox + use textfields in the to order column 2013-07-29 12:31:16 +02:00
Cédric Salvador
6bf95db95e checkbox + improve order detection 2013-07-29 12:31:16 +02:00
Raphaël Doursenaud
c09b05a05f Better wording 2013-07-29 12:31:16 +02:00
Cédric Salvador
3df097695d removed useless variable 2013-07-29 12:31:16 +02:00
Cédric Salvador
a607cb677d Bug fix: stock to buy now computes correctly when the stock too low picto is present 2013-07-29 12:31:15 +02:00
Cédric Salvador
435deae5e9 removed one-liner 2013-07-29 12:31:15 +02:00
Cédric Salvador
357dc3e530 datepicker 2013-07-29 12:31:15 +02:00
Cédric Salvador
e3d5f086b6 background color 2013-07-29 12:31:15 +02:00
Cédric Salvador
5062eb8006 check types on getpost + date research 2013-07-29 12:31:15 +02:00
Cédric Salvador
4b90157aa2 switch from print to echo 2013-07-29 12:31:15 +02:00
Raphaël Doursenaud
7abf23c471 PSR coding style 2013-07-29 12:31:15 +02:00
Cédric Salvador
fe8eb1be92 code cleanup 2013-07-29 12:31:14 +02:00
Cédric Salvador
d1550173cd changed valid button label, position and look 2013-07-29 12:31:14 +02:00
Cédric Salvador
1a41511874 redirect user after orders creation 2013-07-29 12:31:14 +02:00
Cédric Salvador
2c3053b9ee selects 2013-07-29 12:31:14 +02:00
Cédric Salvador
72afadb84e fixed success message showing up even when you don't create orders 2013-07-29 12:31:14 +02:00
Cédric Salvador
787125cf12 reformat 2013-07-29 12:31:14 +02:00
Cédric Salvador
3b6fa4a52b message when succeeds/fails to create orders 2013-07-29 12:31:14 +02:00