Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

4659 Commits

Author SHA1 Message Date
Regis Houssin
bb8aa45253 Fix: duplication result problem 2011-11-20 18:45:55 +01:00
Regis Houssin
065d7996f5 Fix: better with json_encode 2011-11-20 15:25:08 +01:00
Laurent Destailleur
117fb7001b Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-19 19:15:52 +01:00
Laurent Destailleur
3699f13454 Fix: [ bug #233 ] Delete invoice problem with a discount 2011-11-19 19:05:33 +01:00
Regis Houssin
0207191202 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-19 09:45:44 +01:00
Regis Houssin
7a34f4d5e4 Fix: remove duplicate field 2011-11-19 09:45:01 +01:00
Laurent Destailleur
51d30c41a7 Fix: Correct sign 2011-11-18 13:08:51 +01:00
Laurent Destailleur
f60b664c16 Fix: Correct sign on line 2011-11-18 02:16:35 +01:00
Laurent Destailleur
bf9c482f8a Fix: Deposits was not included into lines but into into remain to pay 2011-11-16 18:58:11 +01:00
Laurent Destailleur
3d01d77427 New: Stock change on invoice validation support all warehouse into point 
of sale module
 2011-11-15 20:27:32 +01:00
Laurent Destailleur
0308ed1088 Look: Uniformize css 2011-11-14 18:37:04 +01:00
Laurent Destailleur
5dc660af46 Fix: Stock sign for credit note must be reverted 2011-11-14 17:47:45 +01:00
Laurent Destailleur
7f77391acb Ask warehouse even when going back to draft 2011-11-14 16:57:26 +01:00
Laurent Destailleur
12963265d7 Add confirm message when going back to draft 2011-11-14 16:23:59 +01:00
Laurent Destailleur
7384096d56 Enhance doc for stock movement 2011-11-14 15:46:44 +01:00
Laurent Destailleur
8cdbc2151c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2011-11-14 01:38:33 +01:00
Laurent Destailleur
40a4bcec04 Qual: doxygen 
Fix: Preselected field was not selected
 2011-11-13 00:49:40 +01:00
Laurent Destailleur
9a43c8a14f Qual: Removed useless parameter 2011-11-12 12:59:06 +01:00
Regis Houssin
87d7badd53 Works on merge pdf with encryption 2011-11-12 09:23:54 +01:00
Regis Houssin
a7a85ac513 Fix: uniform code 2011-11-11 16:10:50 +01:00
Laurent Destailleur
10961fb2c9 New: Can choose warehouse for stock change on supplier approbation or 
supplier invoice validation
 2011-11-09 22:10:58 +01:00
Laurent Destailleur
253084feb3 New: Can choose warehouse for invoice validation 2011-11-09 14:31:43 +01:00
Laurent Destailleur
72c0a15f56 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/fiche.php
 2011-11-09 12:17:29 +01:00
Regis Houssin
cbec43e098 Fix: change 'editfieldkey' and 'editfieldval' for compatibility with 
external module and hook system.
Fix: uniform code
 2011-11-09 06:14:42 +08:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
cdacf73743 Fix: [ bug #228 ] Facture depuis commande remisée 2011-11-08 00:48:26 +01:00
Laurent Destailleur
824db25a74 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/class/commonobject.class.php
 2011-11-08 00:17:20 +01:00
Laurent Destailleur
3d0c324f5f Fix: Message for stock movement was wrong or missing 2011-11-08 00:03:19 +01:00
Regis Houssin
dea5ec5e26 Fix: reorder problem with external module 2011-11-07 22:32:22 +08:00
Regis Houssin
f1426c80d4 Fix: entity filter 2011-11-07 09:41:41 +01:00
Laurent Destailleur
8193e8a54e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-06 15:45:03 +01:00
Regis Houssin
ca63f3d8e9 Fix: uniform code and reindent 2011-11-06 11:11:43 +01:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Laurent Destailleur
c9b7bdf22f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/compta/deplacement/fiche.php
 2011-11-05 21:47:41 +01:00
Laurent Destailleur
06c5f3427c New: There is now two "inline edit" solution: Solution 1 use jquery 
and is enabled if MAIN_USE_JQUERY_JEDITABLE is on. Solution 2 use a link
"edit field" on resubmit page for eache field (this is by default). And
we are ready to add more.
New: Add also option MAIN_EDIT_ALSO_INLINE. Goal of this option is to
say: Even if this field can be edited by a global edit form, we allow
field to be edited with the "inline edit" feature (whatever is the
inline edit solution active). This option is to keep the standard
behaviour "We must click a "modify" button to allow to edit globally all
fields at once working and have only this way. If option is on, we can
also use the inlinde edit. If off, inline edit is available only for
fields not included into a global "modify" form.
line
 2011-11-05 21:24:55 +01:00
Regis Houssin
fd49fc97c8 Fix: bad function name 2011-11-05 19:44:48 +01:00
Laurent Destailleur
2b9285384c Merge editfield and editInPlace 2011-11-05 18:25:04 +01:00
Laurent Destailleur
cf365593dc Qual: Revert parameter order (optionnal at end) 2011-11-05 15:43:07 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +01:00
Laurent Destailleur
2996ee7639 New: Add trigger ACTION_DELETE and ACTION_MODIFY 
Fix: LOG_ERROR must be LOG_ERR
 2011-11-01 13:22:39 +01:00
Regis Houssin
dfcc0cff0c Fix: security 2011-10-31 18:52:25 +01:00
Regis Houssin
d9eb4cbeb9 New: add edit in place with ckeditor 
Fix: remove unused jQuery plugin ckeip
 2011-10-31 16:57:10 +01:00
Regis Houssin
419eb248c1 Fix: add generic edit in place select input 2011-10-31 14:34:11 +01:00
Laurent Destailleur
410efe0427 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2011-10-30 23:46:58 +01:00
Regis Houssin
d055e1c0a3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-10-30 09:07:37 +01:00
Juanjo Menent
5c9ba8a548 [task 189] Move Error* key from other.lang into errors.lang files 2011-10-29 23:52:05 +02:00
Regis Houssin
8dc1a20466 Add jeditable select and autocomplete (not stable) 2011-10-29 23:42:24 +02:00
Laurent Destailleur
784f696c85 Qual: Some fixes to make working with PHP option error_reporting 
E_STRICT
 2011-10-29 19:50:25 +02:00
Regis Houssin
5d23da1be1 Fix: uniform code 2011-10-29 08:33:59 +02:00
Laurent Destailleur
ba2c791af5 Fix: Filter on third party 2011-10-28 23:59:16 +02:00